makefile, todo

diff --git a/src/Makefile.am b/src/Makefile.am
index d063d0a97ce54685c202ef84277f3d145709fd58..02beb29305e39fc74f0cc65f7b21adc74a7cd89b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,8 +52,7 @@ bin_PROGRAMS = \
 sbin_PROGRAMS = \
        mount.ceph
 
-bin_SCRIPTS = crun cephd ceph_stop ceph_common.sh ceph_init
-
+bin_SCRIPTS = crun ceph_init
 
 testmsgr_SOURCES = testmsgr.cc msg/SimpleMessenger.cc
 testmsgr_LDADD = libcommon.a
@@ -167,7 +166,14 @@ noinst_LIBRARIES += libcrush_so.a #libcephclient_so.a
 
 # extra bits
 EXTRA_DIST = dstart.sh dstop.sh mkcephfs.sh montest.sh restart.sh verify-mds-journal.sh vstart.sh \
-            crun cephd ceph_stop ceph_common.sh ceph_init
+            crun ceph_common.sh ceph_init ceph-daemons
+
+install-data-local:
+       mkdir -p $(DESTDIR)$(libdir)/ceph
+       $(install_sh_SCRIPT) -m 0755 ceph_common.sh $(DESTDIR)$(libdir)/ceph/ceph_common.sh
+       mkdir -p $(DESTDIR)$(sysconfdir)/init.d
+       $(install_sh_SCRIPT) -m 0755 ceph-daemons $(DESTDIR)$(sysconfdir)/init.d/ceph-daemons
+       $(install_sh_SCRIPT) -m 0755 ceph-daemons $(DESTDIR)$(sysconfdir)/init.d/ceph-daemons
 
 # cleaning
 clean-local:

diff --git a/src/TODO b/src/TODO
index 7ba3699a0b78bf0528c9a8ed33c4921594448da0..5f178a4a9d45b9bc38d8304ae95784f3cdc7420f 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -89,7 +89,6 @@ userspace client
 - fix readdir vs fragment race by keeping a separate frag pos, and ignoring dentries below it
 
 mds
-- already completed replies should wait for journal to flush, if necessary
 - linkage vs cdentry replicas and remote rename....
 - move root inode into stray dir
 - make recovery work with early replies

diff --git a/src/sample.startup.conf b/src/sample.startup.conf
index c46270aba0321394c9451ba16b9c2e426e3cf41d..1f6287ff89de91ea88af72ad8705e32584d667db 100644 (file)
--- a/src/sample.startup.conf
+++ b/src/sample.startup.conf
@@ -1,11 +1,19 @@
 ;
 ; Sample ceph startup.conf file.
 ;
-; NOTE that this file ONLY includes options relating to starting
-; and stopping ceph daemons.  For runtime options, see ceph.conf.
-;
+
+; NOTE: This file ONLY includes options relating to starting and
+; stopping ceph daemons.  For runtime options, see ceph.conf.
+
+; If a 'host' is defined for a daemon, the start/stop script will
+; verify that it matches the hostname (or else ignore it).  If it is
+; not defined, it is assumed that the daemon is intended to start on
+; the current host (e.g., in a setup with a startup.conf on each
+; node).
+
 
 ; global
+[global]
         conf file = ceph.conf
 
 ; monitor
@@ -15,20 +23,24 @@
 [mon0]
        host = alpha
        mon path = /data/mon0
+       mon addr = 192.168.0.10:6789
 
 [mon1]
        host = beta
        mon path = /data/mon1
+       mon addr = 192.168.0.11:6789
 
 [mon2]
        host = gamma
        mon path = /data/mon2
+       mon addr = 192.168.0.12:6789
 
 ; mds
 [mds]
        pid file = /var/run/ceph/mds$mds.pid
 
 [mds0]
+       host = alpha
        
 
 ; osd