Skip to content

Commit a8222d8

Browse files
author
Daniele Sciascia
committed
No need to keep an instance of provider_options in server_state
Undo this change
1 parent 37de57e commit a8222d8

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

include/wsrep/server_state.hpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
#include "provider.hpp"
9292
#include "compiler.hpp"
9393
#include "xid.hpp"
94-
#include "provider_options.hpp"
9594

9695
#include <memory>
9796
#include <deque>
@@ -118,6 +117,7 @@ namespace wsrep
118117
class server_service;
119118
class client_service;
120119
class encryption_service;
120+
class provider_options;
121121

122122
/** @class Server Context
123123
*
@@ -356,11 +356,6 @@ namespace wsrep
356356
return *provider_;
357357
}
358358

359-
wsrep::provider_options* get_provider_options()
360-
{
361-
return &provider_options_;
362-
}
363-
364359
/**
365360
* Initialize connection to cluster.
366361
*
@@ -669,7 +664,6 @@ namespace wsrep
669664
, streaming_appliers_recovered_()
670665
, provider_()
671666
, provider_factory_(wsrep::provider::make_provider)
672-
, provider_options_()
673667
, name_(name)
674668
, id_(wsrep::id::undefined())
675669
, incoming_address_(incoming_address)
@@ -752,7 +746,6 @@ namespace wsrep
752746
bool streaming_appliers_recovered_;
753747
std::unique_ptr<wsrep::provider> provider_;
754748
provider_factory_func provider_factory_;
755-
wsrep::provider_options provider_options_;
756749
std::string name_;
757750
wsrep::id id_;
758751
std::string incoming_address_;

src/wsrep_provider_v26.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "wsrep/tls_service.hpp"
3030
#include "wsrep/allowlist_service.hpp"
3131
#include "wsrep/connection_monitor_service.hpp"
32+
#include "wsrep/provider_options.hpp"
3233

3334
#include "service_helpers.hpp"
3435
#include "thread_service_v1.hpp"

0 commit comments

Comments
 (0)