mds: misc mantle cleanup

In particular, logging now works correctly. DOUT_COND was obsoleted in
f41887e38d70970f4d0181fb73e835ece68cee6c.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mds/Mantle.cc b/src/mds/Mantle.cc
index df1adab773405d12e91de03d79aaa29711631a5e..18d1bc697e13020241019350d05179380a56f294 100644 (file)
--- a/src/mds/Mantle.cc
+++ b/src/mds/Mantle.cc
@@ -16,144 +16,115 @@
 #include "MDSRank.h"
 #include "Mantle.h"
 #include "msg/Messenger.h"
+#include "common/Clock.h"
+#include "CInode.h"
 
 #include <fstream>
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds_balancer
-#undef DOUT_COND
-#define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_balancer
 #undef dout_prefix
 #define dout_prefix *_dout << "mds.mantle "
+#define mantle_dout(lvl) \
+  do {\
+    auto subsys = ceph_subsys_mds;\
+    if ((dout_context)->_conf->subsys.should_gather(ceph_subsys_mds_balancer, lvl)) {\
+      subsys = ceph_subsys_mds_balancer;\
+    }\
+    dout_impl(dout_context, subsys, lvl) dout_prefix
 
-int dout_wrapper(lua_State *L)
-{
-  #undef dout_prefix
-  #define dout_prefix *_dout << "lua.balancer "
-
-  /* Lua indexes the stack from the bottom up */
-  int bottom = -1 * lua_gettop(L);
-  if (!lua_isinteger(L, bottom) || bottom == 0) {
-    dout(0) << "WARNING: BAL_LOG has no message" << dendl;
-    return -EINVAL;
-  }
-
-  /* bottom of the stack is the log level */
-  int level = lua_tointeger(L, bottom);
-
-  /* rest of the stack is the message */
-  string s = "";
-  for (int i = bottom + 1; i < 0; i++)
-    lua_isstring(L, i) ? s.append(lua_tostring(L, i)) : s.append("<empty>");
+#define mantle_dendl dendl; } while (0)
 
-  dout(level) << s << dendl;
-  return 0;
-}
 
-int Mantle::start()
+static int dout_wrapper(lua_State *L)
 {
-  /* build lua vm state */
-  L = luaL_newstate();
-  if (!L) {
-    dout(0) << "WARNING: mantle could not load Lua state" << dendl;
-    return -ENOEXEC;
-  }
-
-  /* balancer policies can use basic Lua functions */
-  luaopen_base(L);
-
-  /* setup debugging */
-  lua_register(L, "BAL_LOG", dout_wrapper);
-
+  int level = luaL_checkinteger(L, 1);
+  lua_concat(L, lua_gettop(L)-1);
+  mantle_dout(level) << lua_tostring(L, 2) << mantle_dendl;
   return 0;
 }
 
-int Mantle::execute(const string &script)
+int Mantle::balance(const std::string &script,
+                    mds_rank_t whoami,
+                    const std::vector<std::map<std::string, double>> &metrics,
+                    std::map<mds_rank_t, double> &my_targets)
 {
-  if (L == NULL) {
-    dout(0) << "ERROR: mantle was not started" << dendl;
-    return -ENOENT;
-  }
+  lua_settop(L, 0); /* clear the stack */
 
   /* load the balancer */
   if (luaL_loadstring(L, script.c_str())) {
-    dout(0) << "WARNING: mantle could not load balancer: "
-            << lua_tostring(L, -1) << dendl;
+    mantle_dout(0) << "WARNING: mantle could not load balancer: "
+            << lua_tostring(L, -1) << mantle_dendl;
     return -EINVAL;
   }
 
-  /* compile/execute balancer */
-  int ret = lua_pcall(L, 0, LUA_MULTRET, 0);
-
-  if (ret) {
-    dout(0) << "WARNING: mantle could not execute script: "
-            << lua_tostring(L, -1) << dendl;
-    return -EINVAL;
-  }
-
-  return 0;
-}
-
-int Mantle::balance(const string &script,
-                    mds_rank_t whoami,
-                    const vector < map<string, double> > &metrics,
-                    map<mds_rank_t,double> &my_targets)
-{
-  if (start() != 0)
-    return -ENOEXEC;
-
   /* tell the balancer which mds is making the decision */
-  lua_pushinteger(L, int(whoami));
-  lua_setfield(L, -2, "whoami");
+  lua_pushinteger(L, (lua_Integer)whoami);
+  lua_setglobal(L, "whoami");
 
   /* global mds metrics to hold all dictionaries */
   lua_newtable(L);
 
   /* push name of mds (i) and its metrics onto Lua stack */
-  for (unsigned i=0; i < metrics.size(); i++) {
-    lua_pushinteger(L, i);
+  for (size_t i=0; i < metrics.size(); i++) {
     lua_newtable(L);
 
     /* push values into this mds's table; setfield assigns key/pops val */
-    for (map<string, double>::const_iterator it = metrics[i].begin();
-         it != metrics[i].end();
-         ++it) {
-      lua_pushnumber(L, it->second);
-      lua_setfield(L, -2, it->first.c_str());
+    for (const auto &it : metrics[i]) {
+      lua_pushnumber(L, it.second);
+      lua_setfield(L, -2, it.first.c_str());
     }
 
     /* in global mds table at stack[-3], set k=stack[-1] to v=stack[-2] */
-    lua_rawset(L, -3);
+    lua_seti(L, -2, i);
   }
 
   /* set the name of the global mds table */
   lua_setglobal(L, "mds");
 
-  int ret = execute(script);
-  if (ret != 0) {
-    lua_close(L);
-    return ret;
+  assert(lua_gettop(L) == 1);
+  if (lua_pcall(L, 0, 1, 0) != LUA_OK) {
+    mantle_dout(0) << "WARNING: mantle could not execute script: "
+            << lua_tostring(L, -1) << mantle_dendl;
+    return -EINVAL;
   }
 
   /* parse response by iterating over Lua stack */
   if (lua_istable(L, -1) == 0) {
-    dout(0) << "WARNING: mantle script returned a malformed response" << dendl;
-    lua_close(L);
+    mantle_dout(0) << "WARNING: mantle script returned a malformed response" << mantle_dendl;
     return -EINVAL;
   }
 
   /* fill in return value */
-  mds_rank_t it = mds_rank_t(0);
   for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 1)) {
-    if (!lua_isnumber(L, -1)) {
-      dout(0) << "WARNING: mantle script returned a malformed response" << dendl;
-      lua_close(L);
+    if (!lua_isinteger(L, -2) || !lua_isnumber(L, -1)) {
+      mantle_dout(0) << "WARNING: mantle script returned a malformed response" << mantle_dendl;
       return -EINVAL;
     }
-    my_targets[it] = (lua_tonumber(L, -1));
-    it++;
+    mds_rank_t rank(lua_tointeger(L, -2));
+    my_targets[rank] = lua_tonumber(L, -1);
   }
 
-  lua_close(L);
   return 0;
 }
+
+Mantle::Mantle (void)
+{
+  /* build lua vm state */
+  L = luaL_newstate();
+  if (!L) {
+    mantle_dout(0) << "WARNING: mantle could not load Lua state" << mantle_dendl;
+    throw std::bad_alloc();
+  }
+
+  /* balancer policies can use basic Lua functions */
+  luaopen_base(L);
+  luaopen_coroutine(L);
+  luaopen_string(L);
+  luaopen_math(L);
+  luaopen_table(L);
+  luaopen_utf8(L);
+
+  /* setup debugging */
+  lua_register(L, "BAL_LOG", dout_wrapper);
+}

diff --git a/src/mds/Mantle.h b/src/mds/Mantle.h
index 5f693fc6d1f69f8bb7100428ae07e13fb3d04029..7970562846f7ae9b07ab9126c77de130d891304a 100644 (file)
--- a/src/mds/Mantle.h
+++ b/src/mds/Mantle.h
@@ -23,18 +23,16 @@
 #include "mdstypes.h"
 
 class Mantle {
-  protected:
-    lua_State *L;
-    map<mds_rank_t, mds_load_t>  mds_load;
-
   public:
-    Mantle() : L(NULL) {};
-    int start();
-    int execute(const string &script);
-    int balance(const string &script,
+    Mantle();
+    ~Mantle() { if (L) lua_close(L); }
+    int balance(const std::string &script,
                 mds_rank_t whoami,
-                const vector < map<string, double> > &metrics,
-                map<mds_rank_t,double> &my_targets);
+                const std::vector <std::map<std::string, double>> &metrics,
+                std::map<mds_rank_t,double> &my_targets);
+
+  protected:
+    lua_State *L;
 };
 
 #endif