From f0e746ab1a988f29d1392b4579dd46157f3e18a5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 23 Aug 2012 12:46:40 -0700 Subject: [PATCH] mon: name cluster uuid file 'cluster_uuid' Begin the transition. Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index fc881a0a9a23b..22554a4a73800 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -275,7 +275,7 @@ int Monitor::init() cluster_logger = pcb.create_perf_counters(); } - // verify cluster_fsid + // verify cluster_uuid { int r = check_fsid(); if (r == -ENOENT) @@ -2030,7 +2030,7 @@ int Monitor::check_fsid() ss << monmap->get_fsid(); string us = ss.str(); bufferlist ebl; - int r = store->get_bl_ss(ebl, "cluster_fsid", 0); + int r = store->get_bl_ss(ebl, "cluster_uuid", 0); if (r < 0) return r; @@ -2041,10 +2041,10 @@ int Monitor::check_fsid() if (pos != string::npos) es.resize(pos); - dout(10) << "check_fsid cluster_fsid contains '" << es << "'" << dendl; + dout(10) << "check_fsid cluster_uuid contains '" << es << "'" << dendl; if (es.length() < us.length() || strncmp(us.c_str(), es.c_str(), us.length()) != 0) { - derr << "error: cluster_fsid file exists with value '" << es + derr << "error: cluster_uuid file exists with value '" << es << "', != our uuid " << monmap->get_fsid() << dendl; return -EEXIST; } @@ -2060,7 +2060,7 @@ int Monitor::write_fsid() bufferlist b; b.append(us); - return store->put_bl_ss(b, "cluster_fsid", 0); + return store->put_bl_ss(b, "cluster_uuid", 0); } /* -- 2.39.5