Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mqbcfg: remove useNtf flag from config #365

Merged
merged 3 commits into from
Jul 22, 2024
Merged

mqbcfg: remove useNtf flag from config #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73af875
Remove useNtf flag from configs
Jul 17, 2024
3783c98
Re-generate Python scripts
waldgange Jul 19, 2024
01c8d6b
Merge branch 'main' into ntftest
678098 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docker/cluster/config/bmqbrkrcfg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@
"highWatermark": 1073741824,
"nodeLowWatermark": 5242880,
"nodeHighWatermark": 10485760,
"heartbeatIntervalMs": 3000,
"useNtf": false
"heartbeatIntervalMs": 3000
}
},
"bmqconfConfig": {
Expand Down
3 changes: 1 addition & 2 deletions docker/single-node/config/bmqbrkrcfg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@
"highWatermark": 1073741824,
"nodeLowWatermark": 5242880,
"nodeHighWatermark": 10485760,
"heartbeatIntervalMs": 3000,
"useNtf": false
"heartbeatIntervalMs": 3000
}
},
"bmqconfConfig": {
Expand Down
3 changes: 1 addition & 2 deletions src/applications/bmqbrkr/etc/bmqbrkrcfg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@
"highWatermark": 1073741824,
"nodeLowWatermark": 5242880,
"nodeHighWatermark": 10485760,
"heartbeatIntervalMs": 3000,
"useNtf": false
"heartbeatIntervalMs": 3000
}
},
"bmqconfConfig": {
Expand Down
4 changes: 0 additions & 4 deletions src/groups/mqb/mqbcfg/mqbcfg.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,6 @@
heartbeatIntervalMs..:
How often (in milliseconds) to check if the channel received data,
and emit heartbeat. 0 to globally disable.
useNtf...............:
Use the new NTF based TCP transport library instead of
the existing one based on BTE
</documentation>
</annotation>
<sequence>
Expand All @@ -257,7 +254,6 @@
<element name='nodeLowWatermark' type='long' default='1024'/>
<element name='nodeHighWatermark' type='long' default='2048'/>
<element name='heartbeatIntervalMs' type='int' default='3000'/>
<element name='useNtf' type='boolean' default='false'/>
</sequence>
</complexType>

Expand Down
31 changes: 7 additions & 24 deletions src/groups/mqb/mqbcfg/mqbcfg_messages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2279,8 +2279,6 @@ const bsls::Types::Int64

const int TcpInterfaceConfig::DEFAULT_INITIALIZER_HEARTBEAT_INTERVAL_MS = 3000;

const bool TcpInterfaceConfig::DEFAULT_INITIALIZER_USE_NTF = false;

const bdlat_AttributeInfo TcpInterfaceConfig::ATTRIBUTE_INFO_ARRAY[] = {
{ATTRIBUTE_ID_NAME,
"name",
Expand Down Expand Up @@ -2326,19 +2324,14 @@ const bdlat_AttributeInfo TcpInterfaceConfig::ATTRIBUTE_INFO_ARRAY[] = {
"heartbeatIntervalMs",
sizeof("heartbeatIntervalMs") - 1,
"",
bdlat_FormattingMode::e_DEC},
{ATTRIBUTE_ID_USE_NTF,
"useNtf",
sizeof("useNtf") - 1,
"",
bdlat_FormattingMode::e_TEXT}};
bdlat_FormattingMode::e_DEC}};

// CLASS METHODS

const bdlat_AttributeInfo*
TcpInterfaceConfig::lookupAttributeInfo(const char* name, int nameLength)
{
for (int i = 0; i < 10; ++i) {
for (int i = 0; i < 9; ++i) {
const bdlat_AttributeInfo& attributeInfo =
TcpInterfaceConfig::ATTRIBUTE_INFO_ARRAY[i];

Expand Down Expand Up @@ -2370,8 +2363,6 @@ const bdlat_AttributeInfo* TcpInterfaceConfig::lookupAttributeInfo(int id)
return &ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_NODE_HIGH_WATERMARK];
case ATTRIBUTE_ID_HEARTBEAT_INTERVAL_MS:
return &ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_HEARTBEAT_INTERVAL_MS];
case ATTRIBUTE_ID_USE_NTF:
return &ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_USE_NTF];
default: return 0;
}
}
Expand All @@ -2388,7 +2379,6 @@ TcpInterfaceConfig::TcpInterfaceConfig(bslma::Allocator* basicAllocator)
, d_ioThreads()
, d_maxConnections(DEFAULT_INITIALIZER_MAX_CONNECTIONS)
, d_heartbeatIntervalMs(DEFAULT_INITIALIZER_HEARTBEAT_INTERVAL_MS)
, d_useNtf(DEFAULT_INITIALIZER_USE_NTF)
{
}

Expand All @@ -2403,7 +2393,6 @@ TcpInterfaceConfig::TcpInterfaceConfig(const TcpInterfaceConfig& original,
, d_ioThreads(original.d_ioThreads)
, d_maxConnections(original.d_maxConnections)
, d_heartbeatIntervalMs(original.d_heartbeatIntervalMs)
, d_useNtf(original.d_useNtf)
{
}

Expand All @@ -2418,8 +2407,7 @@ TcpInterfaceConfig::TcpInterfaceConfig(TcpInterfaceConfig&& original) noexcept
d_port(bsl::move(original.d_port)),
d_ioThreads(bsl::move(original.d_ioThreads)),
d_maxConnections(bsl::move(original.d_maxConnections)),
d_heartbeatIntervalMs(bsl::move(original.d_heartbeatIntervalMs)),
d_useNtf(bsl::move(original.d_useNtf))
d_heartbeatIntervalMs(bsl::move(original.d_heartbeatIntervalMs))
{
}

Expand All @@ -2434,7 +2422,6 @@ TcpInterfaceConfig::TcpInterfaceConfig(TcpInterfaceConfig&& original,
, d_ioThreads(bsl::move(original.d_ioThreads))
, d_maxConnections(bsl::move(original.d_maxConnections))
, d_heartbeatIntervalMs(bsl::move(original.d_heartbeatIntervalMs))
, d_useNtf(bsl::move(original.d_useNtf))
{
}
#endif
Expand All @@ -2458,7 +2445,6 @@ TcpInterfaceConfig::operator=(const TcpInterfaceConfig& rhs)
d_nodeLowWatermark = rhs.d_nodeLowWatermark;
d_nodeHighWatermark = rhs.d_nodeHighWatermark;
d_heartbeatIntervalMs = rhs.d_heartbeatIntervalMs;
d_useNtf = rhs.d_useNtf;
}

return *this;
Expand All @@ -2478,7 +2464,6 @@ TcpInterfaceConfig& TcpInterfaceConfig::operator=(TcpInterfaceConfig&& rhs)
d_nodeLowWatermark = bsl::move(rhs.d_nodeLowWatermark);
d_nodeHighWatermark = bsl::move(rhs.d_nodeHighWatermark);
d_heartbeatIntervalMs = bsl::move(rhs.d_heartbeatIntervalMs);
d_useNtf = bsl::move(rhs.d_useNtf);
}

return *this;
Expand All @@ -2496,7 +2481,6 @@ void TcpInterfaceConfig::reset()
d_nodeLowWatermark = DEFAULT_INITIALIZER_NODE_LOW_WATERMARK;
d_nodeHighWatermark = DEFAULT_INITIALIZER_NODE_HIGH_WATERMARK;
d_heartbeatIntervalMs = DEFAULT_INITIALIZER_HEARTBEAT_INTERVAL_MS;
d_useNtf = DEFAULT_INITIALIZER_USE_NTF;
}

// ACCESSORS
Expand All @@ -2516,7 +2500,6 @@ bsl::ostream& TcpInterfaceConfig::print(bsl::ostream& stream,
printer.printAttribute("nodeLowWatermark", this->nodeLowWatermark());
printer.printAttribute("nodeHighWatermark", this->nodeHighWatermark());
printer.printAttribute("heartbeatIntervalMs", this->heartbeatIntervalMs());
printer.printAttribute("useNtf", this->useNtf());
printer.end();
return stream;
}
Expand Down Expand Up @@ -5428,7 +5411,7 @@ AppConfig& AppConfig::operator=(const AppConfig& rhs)
d_hostDataCenter = rhs.d_hostDataCenter;
d_isRunningOnDev = rhs.d_isRunningOnDev;
d_logsObserverMaxSize = rhs.d_logsObserverMaxSize;
d_latencyMonitorDomain = rhs.d_latencyMonitorDomain;
d_latencyMonitorDomain = rhs.d_latencyMonitorDomain;
d_dispatcherConfig = rhs.d_dispatcherConfig;
d_stats = rhs.d_stats;
d_networkInterfaces = rhs.d_networkInterfaces;
Expand Down Expand Up @@ -5456,7 +5439,7 @@ AppConfig& AppConfig::operator=(AppConfig&& rhs)
d_hostDataCenter = bsl::move(rhs.d_hostDataCenter);
d_isRunningOnDev = bsl::move(rhs.d_isRunningOnDev);
d_logsObserverMaxSize = bsl::move(rhs.d_logsObserverMaxSize);
d_latencyMonitorDomain = bsl::move(rhs.d_latencyMonitorDomain);
d_latencyMonitorDomain = bsl::move(rhs.d_latencyMonitorDomain);
d_dispatcherConfig = bsl::move(rhs.d_dispatcherConfig);
d_stats = bsl::move(rhs.d_stats);
d_networkInterfaces = bsl::move(rhs.d_networkInterfaces);
Expand Down Expand Up @@ -5489,7 +5472,7 @@ void AppConfig::reset()
bdlat_ValueTypeFunctions::reset(&d_bmqconfConfig);
bdlat_ValueTypeFunctions::reset(&d_plugins);
bdlat_ValueTypeFunctions::reset(&d_messagePropertiesV2);
d_configureStream = DEFAULT_INITIALIZER_CONFIGURE_STREAM;
d_configureStream = DEFAULT_INITIALIZER_CONFIGURE_STREAM;
d_advertiseSubscriptions = DEFAULT_INITIALIZER_ADVERTISE_SUBSCRIPTIONS;
}

Expand Down Expand Up @@ -5837,7 +5820,7 @@ Configuration::print(bsl::ostream& stream, int level, int spacesPerLevel) const
} // close package namespace
} // close enterprise namespace

// GENERATED BY @BLP_BAS_CODEGEN_VERSION@
// GENERATED BY BLP_BAS_CODEGEN_2024.07.04.1
// USING bas_codegen.pl -m msg --noAggregateConversion --noExternalization
// --noIdent --package mqbcfg --msgComponent messages mqbcfg.xsd
// ----------------------------------------------------------------------------
Expand Down
55 changes: 5 additions & 50 deletions src/groups/mqb/mqbcfg/mqbcfg_messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4031,8 +4031,6 @@ class TcpInterfaceConfig {
// cluster nodes where BlazingMQ maintains its own cache.
// heartbeatIntervalMs..: How often (in milliseconds) to check if the
// channel received data, and emit heartbeat. 0 to globally disable.
// useNtf...............: Use the new NTF based TCP transport library
// instead of the existing one based on BTE

// INSTANCE DATA
bsls::Types::Int64 d_lowWatermark;
Expand All @@ -4044,7 +4042,6 @@ class TcpInterfaceConfig {
int d_ioThreads;
int d_maxConnections;
int d_heartbeatIntervalMs;
bool d_useNtf;

// PRIVATE ACCESSORS
template <typename t_HASH_ALGORITHM>
Expand All @@ -4063,11 +4060,10 @@ class TcpInterfaceConfig {
ATTRIBUTE_ID_HIGH_WATERMARK = 5,
ATTRIBUTE_ID_NODE_LOW_WATERMARK = 6,
ATTRIBUTE_ID_NODE_HIGH_WATERMARK = 7,
ATTRIBUTE_ID_HEARTBEAT_INTERVAL_MS = 8,
ATTRIBUTE_ID_USE_NTF = 9
ATTRIBUTE_ID_HEARTBEAT_INTERVAL_MS = 8
};

enum { NUM_ATTRIBUTES = 10 };
enum { NUM_ATTRIBUTES = 9 };

enum {
ATTRIBUTE_INDEX_NAME = 0,
Expand All @@ -4078,8 +4074,7 @@ class TcpInterfaceConfig {
ATTRIBUTE_INDEX_HIGH_WATERMARK = 5,
ATTRIBUTE_INDEX_NODE_LOW_WATERMARK = 6,
ATTRIBUTE_INDEX_NODE_HIGH_WATERMARK = 7,
ATTRIBUTE_INDEX_HEARTBEAT_INTERVAL_MS = 8,
ATTRIBUTE_INDEX_USE_NTF = 9
ATTRIBUTE_INDEX_HEARTBEAT_INTERVAL_MS = 8
};

// CONSTANTS
Expand All @@ -4093,8 +4088,6 @@ class TcpInterfaceConfig {

static const int DEFAULT_INITIALIZER_HEARTBEAT_INTERVAL_MS;

static const bool DEFAULT_INITIALIZER_USE_NTF;

static const bdlat_AttributeInfo ATTRIBUTE_INFO_ARRAY[];

public:
Expand Down Expand Up @@ -4224,10 +4217,6 @@ class TcpInterfaceConfig {
// Return a reference to the modifiable "HeartbeatIntervalMs" attribute
// of this object.

bool& useNtf();
// Return a reference to the modifiable "UseNtf" attribute of this
// object.

// ACCESSORS
bsl::ostream&
print(bsl::ostream& stream, int level = 0, int spacesPerLevel = 4) const;
Expand Down Expand Up @@ -4301,9 +4290,6 @@ class TcpInterfaceConfig {
// Return the value of the "HeartbeatIntervalMs" attribute of this
// object.

bool useNtf() const;
// Return the value of the "UseNtf" attribute of this object.

// HIDDEN FRIENDS
friend bool operator==(const TcpInterfaceConfig& lhs,
const TcpInterfaceConfig& rhs)
Expand Down Expand Up @@ -12746,7 +12732,6 @@ void TcpInterfaceConfig::hashAppendImpl(t_HASH_ALGORITHM& hashAlgorithm) const
hashAppend(hashAlgorithm, this->nodeLowWatermark());
hashAppend(hashAlgorithm, this->nodeHighWatermark());
hashAppend(hashAlgorithm, this->heartbeatIntervalMs());
hashAppend(hashAlgorithm, this->useNtf());
}

inline bool TcpInterfaceConfig::isEqualTo(const TcpInterfaceConfig& rhs) const
Expand All @@ -12758,8 +12743,7 @@ inline bool TcpInterfaceConfig::isEqualTo(const TcpInterfaceConfig& rhs) const
this->highWatermark() == rhs.highWatermark() &&
this->nodeLowWatermark() == rhs.nodeLowWatermark() &&
this->nodeHighWatermark() == rhs.nodeHighWatermark() &&
this->heartbeatIntervalMs() == rhs.heartbeatIntervalMs() &&
this->useNtf() == rhs.useNtf();
this->heartbeatIntervalMs() == rhs.heartbeatIntervalMs();
}

// CLASS METHODS
Expand Down Expand Up @@ -12824,12 +12808,6 @@ int TcpInterfaceConfig::manipulateAttributes(t_MANIPULATOR& manipulator)
return ret;
}

ret = manipulator(&d_useNtf,
ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_USE_NTF]);
if (ret) {
return ret;
}

return 0;
}

Expand Down Expand Up @@ -12881,10 +12859,6 @@ int TcpInterfaceConfig::manipulateAttribute(t_MANIPULATOR& manipulator, int id)
&d_heartbeatIntervalMs,
ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_HEARTBEAT_INTERVAL_MS]);
}
case ATTRIBUTE_ID_USE_NTF: {
return manipulator(&d_useNtf,
ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_USE_NTF]);
}
default: return NOT_FOUND;
}
}
Expand Down Expand Up @@ -12950,11 +12924,6 @@ inline int& TcpInterfaceConfig::heartbeatIntervalMs()
return d_heartbeatIntervalMs;
}

inline bool& TcpInterfaceConfig::useNtf()
{
return d_useNtf;
}

// ACCESSORS
template <typename t_ACCESSOR>
int TcpInterfaceConfig::accessAttributes(t_ACCESSOR& accessor) const
Expand Down Expand Up @@ -13014,11 +12983,6 @@ int TcpInterfaceConfig::accessAttributes(t_ACCESSOR& accessor) const
return ret;
}

ret = accessor(d_useNtf, ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_USE_NTF]);
if (ret) {
return ret;
}

return 0;
}

Expand Down Expand Up @@ -13065,10 +13029,6 @@ int TcpInterfaceConfig::accessAttribute(t_ACCESSOR& accessor, int id) const
d_heartbeatIntervalMs,
ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_HEARTBEAT_INTERVAL_MS]);
}
case ATTRIBUTE_ID_USE_NTF: {
return accessor(d_useNtf,
ATTRIBUTE_INFO_ARRAY[ATTRIBUTE_INDEX_USE_NTF]);
}
default: return NOT_FOUND;
}
}
Expand Down Expand Up @@ -13134,11 +13094,6 @@ inline int TcpInterfaceConfig::heartbeatIntervalMs() const
return d_heartbeatIntervalMs;
}

inline bool TcpInterfaceConfig::useNtf() const
{
return d_useNtf;
}

// -------------------------------
// class VirtualClusterInformation
// -------------------------------
Expand Down Expand Up @@ -17736,7 +17691,7 @@ inline const AppConfig& Configuration::appConfig() const
} // close enterprise namespace
#endif

// GENERATED BY @BLP_BAS_CODEGEN_VERSION@
// GENERATED BY BLP_BAS_CODEGEN_2024.07.04.1
// USING bas_codegen.pl -m msg --noAggregateConversion --noExternalization
// --noIdent --package mqbcfg --msgComponent messages mqbcfg.xsd
// ----------------------------------------------------------------------------
Expand Down
Loading
Loading