[Tarantool-patches] [PATCH v2 3/5] feedback_daemon: send feedback on server start

Serge Petrenko sergepetrenko at tarantool.org
Thu Apr 8 16:38:39 MSK 2021


Send the first report as soon as instance's initial configuration
finishes.

Part of #5750
---
 src/box/lua/feedback_daemon.lua | 10 ++++++++++
 src/box/lua/load_cfg.lua        | 34 ++++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/box/lua/feedback_daemon.lua b/src/box/lua/feedback_daemon.lua
index d00eedf39..43bbc1fa2 100644
--- a/src/box/lua/feedback_daemon.lua
+++ b/src/box/lua/feedback_daemon.lua
@@ -323,6 +323,12 @@ local function fill_in_feedback(feedback)
     return feedback
 end
 
+-- fixme: remove this hack.
+-- It's here to prevent too early feedback sending.
+-- This leads to problems with thread sanitization after fork() on Mac OS.
+-- Google objc_initializeAfterForkError for details.
+local is_first_send = true
+
 local function feedback_loop(self)
     fiber.name(PREFIX, { truncate = true })
 
@@ -333,6 +339,10 @@ local function feedback_loop(self)
         if msg == "stop" then
             break
         elseif feedback ~= nil then
+            if is_first_send then
+                fiber.sleep(10)
+                is_first_send = nil
+            end
             pcall(http.post, self.host, json.encode(feedback), {timeout=1})
         end
     end
diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index 44bb95ed1..885a0cac1 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -626,6 +626,27 @@ setmetatable(box, {
      end
 })
 
+-- A trigger on initial box.cfg{} call. Used to perform some checks and
+-- send feedback report once instance is fully configured.
+local function on_initial_config()
+    -- Check if schema version matches Tarantool version and print
+    -- warning if it's not (in case user forgot to call
+    -- box.schema.upgrade()).
+    local needs, schema_version_str = private.schema_needs_upgrade()
+    if needs then
+        local msg = string.format(
+            'Your schema version is %s while Tarantool %s requires a more'..
+            ' recent schema version. Please, consider using box.'..
+            'schema.upgrade().', schema_version_str, box.info.version)
+        log.warn(msg)
+    end
+
+    -- Send feedback as soon as instance is configured.
+    if private.feedback_daemon ~= nil then
+        private.feedback_daemon.send()
+    end
+end
+
 -- Whether box is loaded.
 --
 -- `false` when box is not configured or when the initialization
@@ -716,17 +737,8 @@ local function load_cfg(cfg)
 
     box_is_configured = true
 
-    -- Check if schema version matches Tarantool version and print
-    -- warning if it's not (in case user forgot to call
-    -- box.schema.upgrade()).
-    local needs, schema_version_str = private.schema_needs_upgrade()
-    if needs then
-        local msg = string.format(
-            'Your schema version is %s while Tarantool %s requires a more'..
-            ' recent schema version. Please, consider using box.'..
-            'schema.upgrade().', schema_version_str, box.info.version)
-        log.warn(msg)
-    end
+    on_initial_config()
+
 end
 box.cfg = locked(load_cfg)
 
-- 
2.24.3 (Apple Git-128)



More information about the Tarantool-patches mailing list