Merging upstream version 1:11.4.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 58 insertions, 1 deletions

diff --git a/sql/wsrep_server_state.cc b/sql/wsrep_server_state.cc
index e1730423..f80320fe 100644
--- a/sql/wsrep_server_state.cc
+++ b/sql/wsrep_server_state.cc
@@ -1,4 +1,4 @@
-/* Copyright 2018 Codership Oy <info@codership.com>
+/* Copyright 2018-2022 Codership Oy <info@codership.com>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,9 @@
 #include "wsrep_api.h"
 #include "wsrep_server_state.h"
 #include "wsrep_allowlist_service.h"
+#include "wsrep_event_service.h"
 #include "wsrep_binlog.h" /* init/deinit group commit */
+#include "wsrep_plugin.h" /* make/destroy sysvar helpers */
 
 mysql_mutex_t LOCK_wsrep_server_state;
 mysql_cond_t  COND_wsrep_server_state;
@@ -29,6 +31,10 @@ PSI_cond_key  key_COND_wsrep_server_state;
 
 wsrep::provider::services Wsrep_server_state::m_provider_services;
 
+Wsrep_server_state* Wsrep_server_state::m_instance;
+std::unique_ptr<wsrep::provider_options> Wsrep_server_state::m_options;
+std::vector<st_mysql_sys_var*> Wsrep_server_state::m_sysvars;
+
 Wsrep_server_state::Wsrep_server_state(const std::string& name,
                                        const std::string& incoming_address,
                                        const std::string& address,
@@ -74,6 +80,48 @@ void Wsrep_server_state::init_once(const std::string& name,
   }
 }
 
+int Wsrep_server_state::init_provider(const std::string& provider,
+                                      const std::string& options)
+{
+  DBUG_ASSERT(m_instance);
+  int ret= m_instance->load_provider(provider, options);
+  if (ret)
+  {
+    WSREP_ERROR("Failed to load provider %s with options %s",
+                provider.c_str(), options.c_str());
+    return ret;
+  }
+  return 0;
+}
+
+int Wsrep_server_state::init_options()
+{
+  if (!m_instance) return 1;
+  m_options= std::unique_ptr<wsrep::provider_options>(
+     new wsrep::provider_options(m_instance->provider()));
+  int ret= m_options->initial_options();
+  if (ret)
+  {
+    WSREP_ERROR("Failed to initialize provider options");
+    m_options = nullptr;
+    m_instance->unload_provider();
+    return ret;
+  }
+  m_options->for_each([](wsrep::provider_options::option *opt) {
+    struct st_mysql_sys_var *var= wsrep_make_sysvar_for_option(opt);
+    m_sysvars.push_back(var);
+  });
+  m_sysvars.push_back(nullptr);
+  wsrep_provider_plugin_set_sysvars(&m_sysvars[0]);
+  return 0;
+}
+
+void Wsrep_server_state::deinit_provider()
+{
+  m_options = nullptr;
+  m_instance->unload_provider();
+}
+
 void Wsrep_server_state::destroy()
 {
   if (m_instance)
@@ -82,12 +130,21 @@ void Wsrep_server_state::destroy()
     m_instance= 0;
     mysql_mutex_destroy(&LOCK_wsrep_server_state);
     mysql_cond_destroy(&COND_wsrep_server_state);
+    for (auto var : m_sysvars)
+    {
+      if (var)
+      {
+        wsrep_destroy_sysvar(var);
+      }
+    }
+    m_sysvars.clear();
   }
 }
 
 void Wsrep_server_state::init_provider_services()
 {
   m_provider_services.allowlist_service= wsrep_allowlist_service_init();
+  m_provider_services.event_service= Wsrep_event_service::instance();
 }
 
 void Wsrep_server_state::deinit_provider_services()