From: Sage Weil Date: Tue, 29 Mar 2016 16:49:16 +0000 (-0400) Subject: crush/CrushLocation: add class to manage crush_location X-Git-Tag: v11.0.0~638^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6216461915a736e3081eaeeaed7534468ca7260b;p=ceph.git crush/CrushLocation: add class to manage crush_location The crush_location can come from an explicitly set config, a hook, or a simple fabricated default (root=default host=...). Signed-off-by: Sage Weil --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1cf18b27b03..13d42237175 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -184,7 +184,8 @@ set(crush_srcs crush/hash.c crush/CrushWrapper.cc crush/CrushCompiler.cc - crush/CrushTester.cc) + crush/CrushTester.cc + crush/CrushLocation.cc) add_library(crush STATIC ${crush_srcs}) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 185673c70b5..0ec74a5f8ac 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -417,6 +417,8 @@ OPTION(client_use_faked_inos, OPT_BOOL, false) OPTION(client_mds_namespace, OPT_INT, -1) OPTION(crush_location, OPT_STR, "") // whitespace-separated list of key=value pairs describing crush location +OPTION(crush_location_hook, OPT_STR, "") +OPTION(crush_location_hook_timeout, OPT_INT, 10) OPTION(objecter_tick_interval, OPT_DOUBLE, 5.0) OPTION(objecter_timeout, OPT_DOUBLE, 10.0) // before we ask for a map diff --git a/src/crush/CrushLocation.cc b/src/crush/CrushLocation.cc new file mode 100644 index 00000000000..5a32c436935 --- /dev/null +++ b/src/crush/CrushLocation.cc @@ -0,0 +1,105 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab + +#include "CrushLocation.h" +#include "CrushWrapper.h" +#include "common/config.h" +#include "include/str_list.h" +#include "common/debug.h" + +#include + +#include + +int CrushLocation::update_from_conf() +{ + if (cct->_conf->crush_location.length()) + return _parse(cct->_conf->crush_location); + return 0; +} + +int CrushLocation::_parse(const std::string& s) +{ + std::multimap new_crush_location; + std::vector lvec; + get_str_vec(s, ";, \t", lvec); + int r = CrushWrapper::parse_loc_multimap(lvec, &new_crush_location); + if (r < 0) { + lderr(cct) << "warning: crush_location '" << cct->_conf->crush_location + << "' does not parse, keeping original crush_location " + << loc << dendl; + return -EINVAL; + } + std::lock_guard l(lock); + loc.swap(new_crush_location); + lgeneric_dout(cct, 10) << "crush_location is " << loc << dendl; + return 0; +} + +int CrushLocation::update_from_hook() +{ + if (cct->_conf->crush_location_hook.length() == 0) + return 0; + + SubProcessTimed hook( + cct->_conf->crush_location_hook.c_str(), + SubProcess::CLOSE, SubProcess::PIPE, SubProcess::PIPE, + cct->_conf->crush_location_hook_timeout); + hook.add_cmd_args( + "--cluster", cct->_conf->cluster.c_str(), + "--id", cct->_conf->name.get_id().c_str(), + "--type", cct->_conf->name.get_type_str(), + NULL); + int ret = hook.spawn(); + if (ret != 0) { + lderr(cct) << "error: failed run " << cct->_conf->crush_location_hook << ": " + << hook.err() << dendl; + return ret; + } + + bufferlist bl; + ret = bl.read_fd(hook.get_stdout(), 100 * 1024); + if (ret < 0) { + lderr(cct) << "error: failed read stdout from " + << cct->_conf->crush_location_hook + << ": " << cpp_strerror(-ret) << dendl; + bufferlist err; + err.read_fd(hook.get_stderr(), 100 * 1024); + lderr(cct) << "stderr:\n"; + err.hexdump(*_dout); + *_dout << dendl; + return ret; + } + + if (hook.join() != 0) { + lderr(cct) << "error: failed to join: " << hook.err() << dendl; + return -EINVAL; + } + + std::string out; + bl.copy(0, bl.length(), out); + out.erase(out.find_last_not_of(" \n\r\t")+1); + return _parse(out); +} + +int CrushLocation::init_on_startup() +{ + if (cct->_conf->crush_location.length()) { + return update_from_conf(); + } + if (cct->_conf->crush_location_hook.length()) { + return update_from_hook(); + } + + // start with a sane default + char hostname[HOST_NAME_MAX + 1]; + int r = gethostname(hostname, sizeof(hostname)-1); + if (r < 0) + strcpy(hostname, "unknown_host"); + std::lock_guard l(lock); + loc.clear(); + loc.insert(make_pair("host", hostname)); + loc.insert(make_pair("root", "default")); + lgeneric_dout(cct, 10) << "crush_location is (default) " << loc << dendl; + return 0; +} diff --git a/src/crush/CrushLocation.h b/src/crush/CrushLocation.h new file mode 100644 index 00000000000..b3241eff36c --- /dev/null +++ b/src/crush/CrushLocation.h @@ -0,0 +1,35 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab + +#ifndef CEPH_CRUSH_LOCATION_H +#define CEPH_CRUSH_LOCATION_H + +#include +#include +#include + +class CephContext; + +class CrushLocation { + CephContext *cct; + std::multimap loc; + std::mutex lock; + + int _parse(const std::string& s); + +public: + CrushLocation(CephContext *c) : cct(c) { + update_from_conf(); + } + + int update_from_conf(); ///< refresh from config + int update_from_hook(); ///< call hook, if present + int init_on_startup(); + + std::multimap get_location() { + std::lock_guard l(lock); + return loc; + } +}; + +#endif diff --git a/src/crush/Makefile.am b/src/crush/Makefile.am index 5da6f17f280..dafdc37bd5a 100644 --- a/src/crush/Makefile.am +++ b/src/crush/Makefile.am @@ -5,11 +5,13 @@ libcrush_la_SOURCES = \ crush/hash.c \ crush/CrushWrapper.cc \ crush/CrushCompiler.cc \ - crush/CrushTester.cc + crush/CrushTester.cc \ + crush/CrushLocation.cc noinst_LTLIBRARIES += libcrush.la noinst_HEADERS += \ crush/CrushCompiler.h \ + crush/CrushLocation.h \ crush/CrushTester.h \ crush/CrushTreeDumper.h \ crush/CrushWrapper.h \