From: Sage Weil Date: Mon, 21 May 2012 18:36:43 +0000 (-0700) Subject: monmap: filter_initial_members -> set_initial_members X-Git-Tag: v0.48argonaut~137^2~13^2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b2614b5cfe124a2cfdaed5ef0a87ba628bbc518;p=ceph.git monmap: filter_initial_members -> set_initial_members Signed-off-by: Sage Weil --- diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc index 60e47df779bd..7773bdfbbe1b 100644 --- a/src/mon/MonMap.cc +++ b/src/mon/MonMap.cc @@ -188,10 +188,10 @@ int MonMap::build_from_host_list(std::string hostlist, std::string prefix) return 0; } -void MonMap::filter_initial_members(CephContext *cct, - list& initial_members, - string my_name, entity_addr_t my_addr, - set *removed) +void MonMap::set_initial_members(CephContext *cct, + list& initial_members, + string my_name, entity_addr_t my_addr, + set *removed) { // remove non-initial members unsigned i = 0; diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 449700fdbb53..368b5e0755a4 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -237,10 +237,10 @@ class MonMap { * @param my_addr my addr * @param removed optional pointer to set to insert removed mon addrs to */ - void filter_initial_members(CephContext *cct, - list& initial_members, - string my_name, entity_addr_t my_addr, - set *removed); + void set_initial_members(CephContext *cct, + list& initial_members, + string my_name, entity_addr_t my_addr, + set *removed); void print(ostream& out) const; void print_summary(ostream& out) const; diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 3b1bc4fa0791..84e629d483fb 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -292,8 +292,8 @@ int Monitor::init() if (initial_members.size()) { dout(1) << " initial_members " << initial_members << ", filtering seed monmap" << dendl; - monmap->filter_initial_members(g_ceph_context, initial_members, name, messenger->get_myaddr(), - &extra_probe_peers); + monmap->set_initial_members(g_ceph_context, initial_members, name, messenger->get_myaddr(), + &extra_probe_peers); // (re)calc my rank, in case it changed rank = monmap->get_rank(name); diff --git a/src/monmaptool.cc b/src/monmaptool.cc index 6dffd61f6e91..4c99fdd09c2d 100644 --- a/src/monmaptool.cc +++ b/src/monmaptool.cc @@ -30,7 +30,7 @@ using namespace std; void usage() { - cout << " usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--filter-initial-members] [--add name 1.2.3.4:567] [--rm name] " << std::endl; + cout << " usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--set-initial-members] [--add name 1.2.3.4:567] [--rm name] " << std::endl; exit(1); } @@ -68,7 +68,7 @@ int main(int argc, const char **argv) clobber = true; } else if (ceph_argparse_flag(args, i, "--generate", (char*)NULL)) { generate = true; - } else if (ceph_argparse_flag(args, i, "--filter-initial-members", (char*)NULL)) { + } else if (ceph_argparse_flag(args, i, "--set-initial-members", (char*)NULL)) { filter = true; } else if (ceph_argparse_flag(args, i, "--add", (char*)NULL)) { string name = *i; @@ -151,9 +151,9 @@ int main(int argc, const char **argv) if (initial_members.size()) { cout << "initial_members " << initial_members << ", filtering seed monmap" << std::endl; set removed; - monmap.filter_initial_members(g_ceph_context, initial_members, - string(), entity_addr_t(), - &removed); + monmap.set_initial_members(g_ceph_context, initial_members, + string(), entity_addr_t(), + &removed); cout << "removed " << removed << std::endl; } modified = true; diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t index 7ce010d1098d..c23d51f26247 100644 --- a/src/test/cli/monmaptool/add-exists.t +++ b/src/test/cli/monmaptool/add-exists.t @@ -11,7 +11,7 @@ $ monmaptool --add foo 3.4.5.6:7890 mymonmap monmaptool: monmap file mymonmap monmaptool: map already contains mon.foo - usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--filter-initial-members] [--add name 1.2.3.4:567] [--rm name] + usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--set-initial-members] [--add name 1.2.3.4:567] [--rm name] [1] $ monmaptool --print mymonmap diff --git a/src/test/cli/monmaptool/help.t b/src/test/cli/monmaptool/help.t index 6e6506f7b569..31a372a66539 100644 --- a/src/test/cli/monmaptool/help.t +++ b/src/test/cli/monmaptool/help.t @@ -1,3 +1,3 @@ $ monmaptool --help - usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--filter-initial-members] [--add name 1.2.3.4:567] [--rm name] + usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--set-initial-members] [--add name 1.2.3.4:567] [--rm name] [1] diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t index e8000a5fcf07..e23ebf3e95c9 100644 --- a/src/test/cli/monmaptool/rm-nonexistent.t +++ b/src/test/cli/monmaptool/rm-nonexistent.t @@ -9,7 +9,7 @@ monmaptool: monmap file mymonmap monmaptool: removing doesnotexist monmaptool: map does not contain doesnotexist - usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--filter-initial-members] [--add name 1.2.3.4:567] [--rm name] + usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--set-initial-members] [--add name 1.2.3.4:567] [--rm name] [1] $ monmaptool --print mymonmap diff --git a/src/test/cli/monmaptool/simple.t b/src/test/cli/monmaptool/simple.t index 9aab3ac42ee8..ee7d6304bb26 100644 --- a/src/test/cli/monmaptool/simple.t +++ b/src/test/cli/monmaptool/simple.t @@ -1,4 +1,4 @@ $ monmaptool monmaptool: must specify monmap filename - usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--filter-initial-members] [--add name 1.2.3.4:567] [--rm name] + usage: [--print] [--create [--clobber][--fsid uuid]] [--generate] [--set-initial-members] [--add name 1.2.3.4:567] [--rm name] [1]