summaryrefslogtreecommitdiffstats
path: root/src/ceph_mds.cc
diff options
context:
space:
mode:
authorJohn Spray <john.spray@redhat.com>2014-07-21 21:22:46 +0200
committerJohn Spray <john.spray@redhat.com>2014-07-29 23:32:43 +0200
commit07665ec4b333bb41ec81c477b50e5fcba52890f2 (patch)
tree25d0dd050f10a1a0a0a41a8e39768f6160bb3245 /src/ceph_mds.cc
parentmds: refactor MDS boot (diff)
downloadceph-07665ec4b333bb41ec81c477b50e5fcba52890f2.tar.xz
ceph-07665ec4b333bb41ec81c477b50e5fcba52890f2.zip
mds: introduce explicit DaemonState instead of int
Signed-off-by: John Spray <john.spray@redhat.com>
Diffstat (limited to 'src/ceph_mds.cc')
-rw-r--r--src/ceph_mds.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 3e9fb223bd5..b1ab386cc67 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -94,7 +94,7 @@ int main(int argc, const char **argv)
global_init(NULL, args, CEPH_ENTITY_TYPE_MDS, CODE_ENVIRONMENT_DAEMON, 0);
// mds specific args
- int shadow = 0;
+ MDSMap::DaemonState shadow = MDSMap::STATE_NULL;
std::string dump_file;
std::string val, action;
@@ -104,7 +104,7 @@ int main(int argc, const char **argv)
}
else if (ceph_argparse_witharg(args, i, &val, "--journal-check", (char*)NULL)) {
int r = parse_rank("journal-check", val);
- if (shadow) {
+ if (shadow != MDSMap::STATE_NULL) {
dout(0) << "Error: can only select one standby state" << dendl;
return -1;
}