Skip to content

Commit

Permalink
remove commented part; fix a test
Browse files Browse the repository at this point in the history
  • Loading branch information
emelialei88 committed Nov 2, 2024
1 parent 31dc7b8 commit fdaf867
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 32 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ src/applications/bmqbrkr/etc/etc

# 'sim_cpp11_features.pl' backups
*.bak

# log files
*log*
29 changes: 0 additions & 29 deletions src/groups/mqb/mqbblp/mqbblp_domain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,35 +194,6 @@ int normalizeConfig(mqbconfm::Domain* defn,
{
int updatedValues = 0;

const unsigned int maxDeliveryAttempts = defn->maxDeliveryAttempts();
const mqbcfg::MessageThrottleConfig& messageThrottleConfig =
domain.cluster()->isClusterMember()
? domain.cluster()->clusterConfig()->messageThrottleConfig()
: domain.cluster()->clusterProxyConfig()->messageThrottleConfig();

const unsigned int highThresh = messageThrottleConfig.highThreshold();
const unsigned int minValue = highThresh + 1;

// 'maxDeliveryAttempts' can be zero, which indicates unlimited attempts.
// if (maxDeliveryAttempts && maxDeliveryAttempts < minValue) {
// errorDescription << domain.cluster()->name() << ", " <<
// domain.name()
// << ": maxDeliveryAttempts is less than message "
// "throttling high threshold value. "
// "maxDeliveryAttempts: "
// << maxDeliveryAttempts
// << ", highThreshold: " << highThresh
// << ". Updated "
// "maxDeliveryAttempts to have a value of "
// << minValue
// << ". Please update the value of "
// "maxDeliveryAttempts in this domain's config to
// " "have a value of at least "
// << minValue << ".\n";
// defn->maxDeliveryAttempts() = minValue;
// ++updatedValues;
// }

if (defn->mode().isBroadcastValue() &&
defn->consistency().selectionId() ==
mqbconfm::Consistency::SELECTION_ID_STRONG) {
Expand Down
6 changes: 3 additions & 3 deletions src/integration-tests/test_poison_messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ def _crash_consumer_restart_leader(
# 2. send a message to the consumer
# 3. open a consumer
# 4. kill a consumer
# 5. force a leader change
# 6. open a consumer
# 5. open a consumer
# 6. force a leader change
# 7. kill a consumer a again
# 8. open a consumer
# The message should still exist and be delivered to the consumer (the
Expand Down Expand Up @@ -443,7 +443,7 @@ def test_poison_proxy_and_replica_fanout(self, multi_node: Cluster):
multi_node, proxy, tc.DOMAIN_FANOUT, ["?id=foo", "?id=bar", "?id=baz"]
)

@max_delivery_attempts(2)
@max_delivery_attempts(3)
def test_poison_rda_reset_priority_active(self, multi_node: Cluster):
proxies = multi_node.proxy_cycle()
# pick proxy in datacenter opposite to the primary's
Expand Down

0 comments on commit fdaf867

Please sign in to comment.