Merge remote-tracking branch 'gh/wip-upstart' into next

13 files changed, 44 insertions, 13 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index eebb6c7cc5c..cbbedd9342f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1073,11 +1073,14 @@ EXTRA_DIST += \
 	$(ceph_tool_gui_DATA) \
 	$(srcdir)/test/encoding/readable.sh \
 	$(srcdir)/test/encoding/check-generated.sh \
+	$(srcdir)/upstart/ceph.conf \
 	$(srcdir)/upstart/ceph-mon.conf \
 	$(srcdir)/upstart/ceph-mon-all.conf \
 	$(srcdir)/upstart/ceph-mon-all-starter.conf \
 	$(srcdir)/upstart/ceph-create-keys.conf \
 	$(srcdir)/upstart/ceph-osd.conf \
+	$(srcdir)/upstart/ceph-osd-all.conf \
+	$(srcdir)/upstart/ceph-osd-all-starter.conf \
 	$(srcdir)/upstart/ceph-hotplug.conf \
 	$(srcdir)/upstart/ceph-mds.conf \
 	$(srcdir)/upstart/ceph-mds-all.conf \
diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf
index 2748f35c93a..fe7e2bd32ad 100644
--- a/src/upstart/ceph-mds-all-starter.conf
+++ b/src/upstart/ceph-mds-all-starter.conf
@@ -1,7 +1,7 @@
 description "Ceph MDS (task to start all instances)"
 
 start on starting ceph-mds-all
-stop on runlevel [!2345]
+stop on runlevel [!2345] or stopping ceph-mds-all
 
 task
 
diff --git a/src/upstart/ceph-mds-all.conf b/src/upstart/ceph-mds-all.conf
index 0b58f5f8a60..c9da72ec023 100644
--- a/src/upstart/ceph-mds-all.conf
+++ b/src/upstart/ceph-mds-all.conf
@@ -1,4 +1,4 @@
 description "Ceph MDS (all instances)"
 
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [!2345]
+start on starting ceph
+stop on stopping ceph
diff --git a/src/upstart/ceph-mds.conf b/src/upstart/ceph-mds.conf
index 8120fd490f2..77841cdccd7 100644
--- a/src/upstart/ceph-mds.conf
+++ b/src/upstart/ceph-mds.conf
@@ -6,7 +6,7 @@ stop on runlevel [!2345] or stopping ceph-mds-all
 respawn
 respawn limit 5 30
 
-limit nofile 8192
+limit nofile 16384 16384
 
 pre-start script
     set -e
diff --git a/src/upstart/ceph-mon-all-starter.conf b/src/upstart/ceph-mon-all-starter.conf
index f7188cb7405..7101a8acca9 100644
--- a/src/upstart/ceph-mon-all-starter.conf
+++ b/src/upstart/ceph-mon-all-starter.conf
@@ -1,7 +1,7 @@
 description "Ceph MON (start all instances)"
 
 start on starting ceph-mon-all
-stop on runlevel [!2345]
+stop on runlevel [!2345] or stopping ceph-mon-all
 
 task
 
diff --git a/src/upstart/ceph-mon-all.conf b/src/upstart/ceph-mon-all.conf
index 006f2f20745..10c17eab689 100644
--- a/src/upstart/ceph-mon-all.conf
+++ b/src/upstart/ceph-mon-all.conf
@@ -1,4 +1,4 @@
 description "Ceph monitor (all instances)"
 
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [!2345]
+start on starting ceph
+stop on runlevel [!2345] or stopping ceph
diff --git a/src/upstart/ceph-mon.conf b/src/upstart/ceph-mon.conf
index 90cb67b190b..17fd11b6a24 100644
--- a/src/upstart/ceph-mon.conf
+++ b/src/upstart/ceph-mon.conf
@@ -6,7 +6,7 @@ stop on runlevel [!2345] or stopping ceph-mon-all
 respawn
 respawn limit 5 30
 
-limit nofile 16384
+limit nofile 16384 16384
 
 pre-start script
     set -e
diff --git a/src/upstart/ceph-osd-all-starter.conf b/src/upstart/ceph-osd-all-starter.conf
new file mode 100644
index 00000000000..c4d74e58442
--- /dev/null
+++ b/src/upstart/ceph-osd-all-starter.conf
@@ -0,0 +1,20 @@
+description "Ceph OSD (start all instances)"
+
+start on starting ceph-osd-all
+stop on runlevel [!2345] or stopping ceph-osd-all
+
+task
+
+script
+  set -e
+  # TODO what's the valid charset for cluster names and osd ids?
+  find /var/lib/ceph/osd/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[a-z0-9]+-[a-z0-9._-]+' -printf '%P\n' \
+  | while read f; do
+    if [ -e "/var/lib/ceph/osd/$f/ready" ]; then
+        cluster="${f%%-*}"
+        id="${f#*-}"
+
+	initctl emit ceph-osd cluster="$cluster" id="$id"
+    fi
+  done
+end script
diff --git a/src/upstart/ceph-osd-all.conf b/src/upstart/ceph-osd-all.conf
new file mode 100644
index 00000000000..eb379c3d094
--- /dev/null
+++ b/src/upstart/ceph-osd-all.conf
@@ -0,0 +1,4 @@
+description "Ceph OSD (all instances)"
+
+start on starting ceph
+stop on runlevel [!2345] or stopping ceph
diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index 9bbb91cb6a5..23ca2eb2a23 100644
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -1,12 +1,12 @@
 description "Ceph OSD"
 
 start on ceph-osd
-stop on runlevel [!2345]
+stop on runlevel [!2345] or stopping ceph-osd-all
 
 respawn
 respawn limit 5 30
 
-limit nofile 8192
+limit nofile 16384 16384
 
 pre-start script
     set -e
diff --git a/src/upstart/ceph.conf b/src/upstart/ceph.conf
new file mode 100644
index 00000000000..d129defad7a
--- /dev/null
+++ b/src/upstart/ceph.conf
@@ -0,0 +1,4 @@
+description "Ceph"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
diff --git a/src/upstart/radosgw-all-starter.conf b/src/upstart/radosgw-all-starter.conf
index d3cabcf4ee3..b9357a38fdf 100644
--- a/src/upstart/radosgw-all-starter.conf
+++ b/src/upstart/radosgw-all-starter.conf
@@ -1,7 +1,7 @@
 description "Ceph radosgw (task to start all instances)"
 
 start on starting radosgw-all
-stop on runlevel [!2345]
+stop on runlevel [!2345] or stopping radosgw-all
 
 task
 
diff --git a/src/upstart/radosgw-all.conf b/src/upstart/radosgw-all.conf
index 2f2e27f9d51..af2b84d24f8 100644
--- a/src/upstart/radosgw-all.conf
+++ b/src/upstart/radosgw-all.conf
@@ -1,4 +1,4 @@
 description "Ceph radosgw (all instances)"
 
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [!2345]
+start on starting ceph
+stop on runlevel [!2345] or stopping ceph