Commit 4d7a3fe

committed

QQ: exclude delivery_limit from policy repair comparison.

As it cannot be updated as part of a policy when it is disabled (-1) it needs to be excluded from comparison

1 parent 676698a commit 4d7a3feCopy full SHA for 4d7a3fe

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -770,15 +770,19 @@ system_recover(quorum_queues) ->`
`770`	`770`	`end.`
`771`	`771`
`772`	`772`	`maybe_apply_policies(Q, #{config := CurrentConfig}) ->`
`773`		`- NewPolicyConfig = gather_policy_config(Q, false),`
	`773`	`+ %% delivery_limit can't be updated from a policy and thus has to be`
	`774`	`+ %% excluded from the comparison`
	`775`	`+ NewPolicyConfig = maps:without([delivery_limit],`
	`776`	`+ gather_policy_config(Q, false)),`
`774`	`777`
`775`	`778`	`RelevantKeys = maps:keys(NewPolicyConfig),`
`776`	`779`	`CurrentPolicyConfig = maps:with(RelevantKeys, CurrentConfig),`
`777`	`780`
`778`	`781`	`ShouldUpdate = NewPolicyConfig =/= CurrentPolicyConfig,`
`779`	`782`	`case ShouldUpdate of`
`780`	`783`	`true ->`
`781`		`- ?LOG_DEBUG("Re-applying policies to ~ts", [rabbit_misc:rs(amqqueue:get_name(Q))]),`
	`784`	`+ ?LOG_DEBUG("Re-applying policies for ~ts",`
	`785`	`+ [rabbit_misc:rs(amqqueue:get_name(Q))]),`
`782`	`786`	`policy_changed(Q),`
`783`	`787`	`ok;`
`784`	`788`	`false -> ok`

Comments

(0)