From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Mon, 23 Oct 2023 13:46:06 +0000 (+0000)
Subject: rgw/lua: print luarocks config during reload
X-Git-Tag: v19.0.0~44^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08e655d8baef3e1b2d7101c291e6e9626ecb65c7;p=ceph.git

rgw/lua: print luarocks config during reload

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
---

diff --git a/src/rgw/rgw_lua.cc b/src/rgw/rgw_lua.cc
index 6a5780a3eb1c..5b518d2e27cb 100644
--- a/src/rgw/rgw_lua.cc
+++ b/src/rgw/rgw_lua.cc
@@ -213,11 +213,33 @@ int install_packages(const DoutPrefixProvider *dpp, rgw::sal::Driver* driver,
     return rc;
   }
   install_dir.assign(tmp_luarocks_path);
+  
+  {  
+    bp::ipstream is;
+    const auto cmd = p.string() + " config";
+    bp::child c(cmd, bp::std_in.close(), (bp::std_err & bp::std_out) > is);
+    
+    std::string lines = std::string("Lua CMD: ") + cmd;
+    std::string line;
+    
+    do {
+      if (!line.empty()) {
+        lines.append("\n\t");
+        lines.append(line);
+      }
+    } while (c.running() && std::getline(is, line));
+
+    c.wait();
+    line = "exit code: " + std::to_string(c.exit_code());
+    lines.append("\n\t");
+    lines.append(line);
+    ldpp_dout(dpp, 20) << lines << dendl;
+  }
 
   // the lua rocks install dir will be created by luarocks the first time it is called
   for (const auto& package : packages) {
     bp::ipstream is;
-    const auto cmd = p.string() + " install --lua-version " + CEPH_LUA_VERSION + " --tree " + install_dir + " --deps-mode one " + package;
+    const auto cmd = p.string() + " install --no-doc --no-manifest --check-lua-versions --lua-version " + CEPH_LUA_VERSION + " --tree " + install_dir + " --deps-mode one " + package;
     bp::child c(cmd, bp::std_in.close(), (bp::std_err & bp::std_out) > is);
 
     // once package reload is supported, code should yield when reading output