From: John Spray <john.spray@redhat.com>
Date: Fri, 13 Jun 2014 07:41:59 +0000 (+0100)
Subject: mds: Update default FS name
X-Git-Tag: v0.84~161^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2b151d009640114b2565c901d6f41f6cd5ec652;p=ceph.git

mds: Update default FS name

From 'default' to 'cephfs' so that it looks
at least vaguely meaningful.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 5eeb6304ba5a..614d2cbb1d7a 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -296,7 +296,7 @@ function test_mon_mds()
 {
   ceph osd pool create fs_data 10
   ceph osd pool create fs_metadata 10
-  ceph fs new default fs_metadata fs_data
+  ceph fs new cephfs fs_metadata fs_data
 
   # Check for default crash_replay_interval set automatically in 'fs new'
   ceph osd dump | grep fs_data > $TMPFILE
@@ -365,7 +365,7 @@ function test_mon_mds()
   metadata_poolnum=$(ceph osd dump | grep 'pool.*fs_metadata' | awk '{print $2;}')
   set +e
 
-  ceph fs rm default --yes-i-really-mean-it
+  ceph fs rm cephfs --yes-i-really-mean-it
 
   ceph mds newfs $metadata_poolnum $ec_poolnum --yes-i-really-mean-it 2>$TMPFILE
   check_response 'erasure-code' $? 22
diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 1693e3aa8182..6923fa3c4258 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -71,6 +71,8 @@ extern CompatSet get_mdsmap_compat_set_base(); // pre v0.20
 #define MDS_FEATURE_INCOMPAT_INLINE CompatSet::Feature(7, "mds uses inline data")
 #define MDS_FEATURE_INCOMPAT_NOANCHOR CompatSet::Feature(8, "no anchor table")
 
+#define MDS_FS_NAME_DEFAULT "cephfs"
+
 class MDSMap {
 public:
   // mds states
@@ -193,7 +195,7 @@ public:
 
 public:
   MDSMap() 
-    : epoch(0), enabled(false), fs_name("default"),
+    : epoch(0), enabled(false), fs_name(MDS_FS_NAME_DEFAULT),
       flags(0), last_failure(0),
       last_failure_osd_epoch(0),
       tableserver(0), root(0),
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index b8be6ea691c0..689f70a07d50 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -908,8 +908,8 @@ bool MDSMonitor::management_command(
 {
   if (prefix == "mds newfs") {
     /* Legacy `newfs` command, takes pool numbers instead of
-     * names, assumes fs name to be 'default', and can
-     * overwrite existing filesystem settings */
+     * names, assumes fs name to be MDS_FS_NAME_DEFAULT, and
+     * can overwrite existing filesystem settings */
     MDSMap newmap;
     int64_t metadata, data;
 
@@ -966,7 +966,7 @@ bool MDSMonitor::management_command(
       newmap.inc = pending_mdsmap.inc;
       pending_mdsmap = newmap;
       pending_mdsmap.epoch = mdsmap.epoch + 1;
-      create_new_fs(pending_mdsmap, "default", metadata, data);
+      create_new_fs(pending_mdsmap, MDS_FS_NAME_DEFAULT, metadata, data);
       ss << "new fs with metadata pool " << metadata << " and data pool " << data;
       r = 0;
       return true;
diff --git a/src/vstart.sh b/src/vstart.sh
index 7b1ff2644f9a..58cff8f9e862 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -536,7 +536,7 @@ EOF
         echo $cmd
         $cmd
 
-        cmd="$CEPH_ADM fs new default cephfs_metadata cephfs_data"
+        cmd="$CEPH_ADM fs new cephfs cephfs_metadata cephfs_data"
         echo $cmd
         $cmd
 	fi