initscripts: add 'cleanlogs' and 'cleanalllogs' options

diff --git a/src/ceph-daemons b/src/ceph-daemons
index 8d24cfca3086438cfcb3fd010d21047619afff4a..7288a118e32aacb7c4a65b8e6eac47d561858ef8 100755 (executable)
--- a/src/ceph-daemons
+++ b/src/ceph-daemons
@@ -175,9 +175,16 @@ echo $name
 
        cleanlogs)
            get_conf log_dir "/var/log/ceph" "log dir" $sections
-           do_cmd "for f in $log_dir/$name*; do rm `readlink $f` ; rm $f ; done"
+           get_conf log_sym_dir "/var/log/ceph" "log sym dir" $sections
+           do_cmd "for f in $log_sym_dir/$name*; do rm -f \`readlink \$f\` ; rm -f \$f ; done"
            ;;
-       
+
+       cleanalllogs)
+           get_conf log_dir "/var/log/ceph" "log dir" $sections
+           get_conf log_sym_dir "/var/log/ceph" "log sym dir" $sections
+           do_cmd "rm -f $log_dir/* $log_sym_dir/*"
+           ;;
+
        *)
            usage_exit
            ;;

diff --git a/src/cosd.cluster.conf b/src/cosd.cluster.conf
new file mode 100644 (file)
index 0000000..35412b0
--- /dev/null
+++ b/src/cosd.cluster.conf
@@ -0,0 +1,39 @@
+[global]
+       pid file = /home/sage/ceph/src/out/$name.pid
+       restart on core dump = false
+       conf file = cosdruntime.conf
+       log sym dir = /home/sage/ceph/src/out
+       log dir = /data/$host
+
+[mon]
+[mon0]
+       host = cosd0
+       mon addr = 10.3.14.95:6789
+       mon data = /home/sage/ceph/src/mondata/mon$num
+
+[osd]
+[osd0]
+       host = cosd1
+       osd data = devm/osd0
+       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0
+       btrfs path = devm/osd0
+[osd4]
+       host = cosd2
+       osd data = devm/osd4
+       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0
+
+[osd9]
+       host = cosd3
+       osd data = devm/osd9
+       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
+[osd13]
+       host = cosd4
+       osd data = devm/osd13
+       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
+[osd17]
+       host = cosd5
+       osd data = devm/osd17
+       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
+
+[mds0]
+       host = cosd0
\ No newline at end of file

diff --git a/src/cosd.conf b/src/cosd.conf
deleted file mode 100644 (file)
index 52fc1c9..0000000
--- a/src/cosd.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-[global]
-       pid file = /home/sage/ceph/src/out/$name.pid
-       restart on core dump = false
-       conf file = cosdruntime.conf
-
-[mon]
-[mon0]
-       host = cosd0
-       mon addr = 10.3.14.95:6789
-       mon data = /home/sage/ceph/src/mondata/mon$num
-
-[osd]
-[osd0]
-       host = cosd1
-       osd data = devm/osd0
-       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0
-       btrfs path = devm/osd0
-[osd4]
-       host = cosd2
-       osd data = devm/osd4
-       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0
-
-[osd9]
-       host = cosd3
-       osd data = devm/osd9
-       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
-[osd13]
-       host = cosd4
-       osd data = devm/osd13
-       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
-[osd17]
-       host = cosd5
-       osd data = devm/osd17
-       btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
-
-[mds0]
-       host = cosd0
\ No newline at end of file