*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@148 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/config.cc b/ceph/config.cc
index 3a7ef3257c8515adaa9d60eefdcc54d9547147c1..05e3a4db809de9c3aa2a6e0de793955cb5b11712 100644 (file)
--- a/ceph/config.cc
+++ b/ceph/config.cc
@@ -14,13 +14,13 @@
 md_config_t g_conf = {
   num_mds: 13,
   num_osd: 10,
-  num_client: 50,
+  num_client: 1,
 
   osd_cow: false, // crashy? true,  
 
   client_cache_size: 100,
   client_cache_mid: .5,
-  client_requests: 100,
+  client_requests: 10000,
   client_deterministic: false,
   
   log_messages: true,
@@ -33,7 +33,7 @@ md_config_t g_conf = {
   fake_clock: true,
   fakemessenger_serialize: false,
 
-  debug: 10,
+  debug: 15,
 
   mdcache_size: MDS_CACHE_SIZE,
   mdcache_mid: .8,
@@ -55,10 +55,10 @@ md_config_t g_conf = {
   client_op_readdir: true,
   client_op_mknod:   true,
   client_op_link:    false,
-  client_op_unlink:  true,
+  client_op_unlink:  false,
   client_op_rename:  false,
 
-  client_op_mkdir:   true, 
+  client_op_mkdir:   false,//true,  // note: corrupts osddata if we don't shut down & flush logs cleanly
   client_op_rmdir:   false,
   client_op_symlink: true,
 

diff --git a/ceph/mds/CInode.cc b/ceph/mds/CInode.cc
index b490694083226eb00223ce7c26ee9876c8c87287..9d7317a11917d77658cff7f3e3d05bdd5cbfcb7e 100644 (file)
--- a/ceph/mds/CInode.cc
+++ b/ceph/mds/CInode.cc
@@ -30,6 +30,8 @@ ostream& operator<<(ostream& out, CInode& in)
        assert(in.get_replica_nonce() >= 0);
   }
 
+  if (in.is_symlink()) out << " symlink";
+
   out << " hard=" << in.hardlock;
   out << " soft=" << in.softlock;
 

diff --git a/ceph/osd/OSD.cc b/ceph/osd/OSD.cc
index 50ab51c211ceb3eed41a77d681de191110f0baca..58e118de3110c94fac242c46b072a90335e2db7f 100644 (file)
--- a/ceph/osd/OSD.cc
+++ b/ceph/osd/OSD.cc
@@ -85,7 +85,7 @@ char fn[100];
 char fn2[100];
 char *get_filename_nopid(int osd, object_t oid) 
 {
-  sprintf(fn, "%s/%d/%d", osd_base_path, osd, oid);
+  sprintf(fn, "%s/%d/%lld", osd_base_path, osd, oid);
   return fn;
 }
 char *get_filename(int osd, object_t oid) 
@@ -93,12 +93,12 @@ char *get_filename(int osd, object_t oid)
   if (!g_conf.osd_cow)
        return get_filename_nopid(osd,oid);
   
-  sprintf(fn, "%s/%d/%d.%d", osd_base_path, osd, oid, getpid());
+  sprintf(fn, "%s/%d/%lld.%d", osd_base_path, osd, oid, getpid());
   return fn;
 }
 char *get_filename2(int osd, object_t oid) 
 {
-  sprintf(fn2, "%s/%d/%d.tmp", osd_base_path, osd, oid);
+  sprintf(fn2, "%s/%d/%lld.tmp", osd_base_path, osd, oid);
   return fn2;
 }