From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 7E19E6EC5F; Wed, 21 Apr 2021 09:32:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7E19E6EC5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618986740; bh=xIpDg5WbRcfITq2K9wyeERL6sYISQpYYnBcwGpY0mEk=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=yHt/DSqGl2+oUcjeVhwDPEmk2Wmcb+2Ju4k2WW2zVdYUC7yuID6+zE5dTe4oKzovI 9zeK+Mvx6CJHyEPUFhGyJuYaEgKqLpHIR8QZMebGcdhVR+r9W2PGrymxFWDdMDo/qS PeNFvYL6RI1cR+lwwaZlMVlfZi2Jt1KsklyEIYO8= Received: from smtp38.i.mail.ru (smtp38.i.mail.ru [94.100.177.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id BB3626EC5F for ; Wed, 21 Apr 2021 09:31:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BB3626EC5F Received: by smtp38.i.mail.ru with esmtpa (envelope-from ) id 1lZ6Or-0003Ot-NN; Wed, 21 Apr 2021 09:31:50 +0300 To: avtikhon@tarantool.org, kyukhin@tarantool.org Date: Wed, 21 Apr 2021 09:31:44 +0300 Message-Id: <3ec624b87aeb632d2bcbece9f12484cbb3298f43.1618986404.git.sergepetrenko@tarantool.org> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480B1C8842CE613979723F2FB4628545A35182A05F5380850408DFCF3D2B06D26AB5DB07AB8C2E5C0F10F52C9A4FD1DF8B2BC8DF318E7CA3019 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7624C4D757C4F5837EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637835928C62272F24E8638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2BCAAB6F268C8319F96C27C1D1E844105CCD65611471A2689D2E47CDBA5A96583C09775C1D3CA48CF32941D3B652364A4117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE7E4DF6D1C10F22F599FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE7D984336DE53E6142D32BA5DBAC0009BE395957E7521B51C20BC6067A898B09E4090A508E0FED6299176DF2183F8FC7C0298E1E51661CBDD7CD04E86FAF290E2D7E9C4E3C761E06A71DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6753C3A5E0A5AB5B7089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24209795067102C07E8F7B195E1C97831D160DB7B7F1E042450096BBBE4EB4356 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C3E7AEEB2EA3DACB3CCC6A9B26440D6F011C5AF394B1DD7C39C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349A949488F6BF46DD3AD344CF03CEAC48C081FC482E285BA32B66C81B4B5999B54A950630606384A01D7E09C32AA3244C25D28FD843AB641A0B9AB4EC066BD0C169B6CAE0477E908D927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojlPRl29Bx4WHwxOlOyYtCeA== X-Mailru-Sender: 583F1D7ACE8F49BDD2846D59FC20E9F8F6D91C620C29244DD75FA77B41EB59BA536FCCD46ED3D72E424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH 1/3] Revert "feedback_daemon: send feedback on server start" X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Serge Petrenko via Tarantool-patches Reply-To: Serge Petrenko Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This reverts commit bc15e0f070c89e00cd76b0432d906697aae25202. --- src/box/lua/feedback_daemon.lua | 10 ---------- src/box/lua/load_cfg.lua | 34 +++++++++++---------------------- 2 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/box/lua/feedback_daemon.lua b/src/box/lua/feedback_daemon.lua index 7a6b0c94c..8953185b2 100644 --- a/src/box/lua/feedback_daemon.lua +++ b/src/box/lua/feedback_daemon.lua @@ -328,12 +328,6 @@ local function fill_in_feedback(self, 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 }) @@ -343,10 +337,6 @@ local function feedback_loop(self) if msg == "stop" then break end - if is_first_send then - fiber.sleep(10) - is_first_send = nil - end local feedback = self:generate_feedback() if feedback ~= nil then pcall(http.post, self.host, json.encode(feedback), {timeout=1}) diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua index 11fa98586..4df70c210 100644 --- a/src/box/lua/load_cfg.lua +++ b/src/box/lua/load_cfg.lua @@ -661,27 +661,6 @@ 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 @@ -776,8 +755,17 @@ local function load_cfg(cfg) box_is_configured = true - 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 end box.cfg = locked(load_cfg) -- 2.24.3 (Apple Git-128)