[kudu] branch master updated: Change order of operations during InitCatalogManagerTask

[alexey]

This is an automated email from the ASF dual-hosted git repository.

alexey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new 0329d35f2 Change order of operations during InitCatalogManagerTask
0329d35f2 is described below

commit 0329d35f23f8558830b480ec3e6e69690785acbc
Author: Ádám Bakai <aba...@cloudera.com>
AuthorDate: Tue Mar 21 14:00:31 2023 +0100

    Change order of operations during InitCatalogManagerTask
    
    In MasterStartupTest.StartupWebPage test, WaitForCatalogManagerInit is
    executed, which waits until catalog_manager_init_status_ is set. It is
    set by InitCatalogManagerTask and with the previous order of operations
    it was possible (but very rare) that catalog_manager_init_status_ was
    set but the timer was not stopped at the time of the startup http
    request, which resulted an output where
    initialize_master_catalog_status was 0. With this order
    initialize_master_catalog_progress_ is always set if
    WaitForCatalogManagerInit is finished.
    
    Change-Id: I64c980a8b357c99d4431a02d58b3c03a60bae1ad
    Reviewed-on: http://gerrit.cloudera.org:8080/19639
    Tested-by: Kudu Jenkins
    Reviewed-by: Alexey Serbin <ale...@apache.org>
---
 src/kudu/master/master.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kudu/master/master.cc b/src/kudu/master/master.cc
index 82edad2c0..1c2ba417a 100644
--- a/src/kudu/master/master.cc
+++ b/src/kudu/master/master.cc
@@ -391,8 +391,8 @@ void Master::InitCatalogManagerTask() {
   if (!s.ok()) {
     LOG(ERROR) << "Unable to init master catalog manager: " << s.ToString();
   }
-  catalog_manager_init_status_.Set(s);
   startup_path_handler_->initialize_master_catalog_progress()->Stop();
+  catalog_manager_init_status_.Set(s);
 }
 
 Status Master::InitCatalogManager() {