Circuit breaker backport #2425

rachedbenmustapha · 2023-06-16T17:52:15Z

No description provided.

bert-e · 2023-06-16T17:52:18Z

Hello rachedbenmustapha,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2023-06-16T17:52:24Z

Incorrect fix version

The Fix Version/s in issue BB-413 contains:

7.70.2

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

7.70.2
8.4.26
8.5.5
8.6.23

Please check the Fix Version/s of BB-413, or the target
branch of this pull request.

bert-e · 2023-08-25T22:21:13Z

Incorrect fix version

The Fix Version/s in issue BB-413 contains:

7.70.5

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

7.70.5
8.5.5
8.6.27
8.7.0

Please check the Fix Version/s of BB-413, or the target
branch of this pull request.

jonathan-gramain · 2023-09-12T01:10:40Z

extensions/lifecycle/conductor/LifecycleConductor.js

@@ -427,7 +492,19 @@ class LifecycleConductor {
                }, next);
            },
            () => isTruncated,
-            err => cb(err, nEnqueued));
+            err => {
+                if (!err) {


Shouldn't we also call cb when there is an error?

You're right, seems like the cb call was wrongly deduped.

jonathan-gramain · 2023-09-12T01:11:47Z

extensions/lifecycle/conductor/LifecycleConductor.js

+        return this._bucketSource === 'zookeeper' || // bucket list stored in zk
+            this._bucketSource === 'mongodb' || // bucket stream checkpoints in zk
+            this._bucketSource === 'bucketd'; // bucket stream checkpoints in zk


Little more compact (feel free to ignore):

Suggested change

return this._bucketSource === 'zookeeper' || // bucket list stored in zk

this._bucketSource === 'mongodb' || // bucket stream checkpoints in zk

this._bucketSource === 'bucketd'; // bucket stream checkpoints in zk

return ['zookeeper', 'mongodb', 'bucketd'].includes(this._bucketSource);

bert-e · 2023-09-12T01:13:58Z

Incorrect fix version

The Fix Version/s in issue BB-413 contains:

7.70.5

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

7.70.6
8.5.5
8.6.28
8.7.0

Please check the Fix Version/s of BB-413, or the target
branch of this pull request.

nicolas2bert

LGTM, once the callback remark is addressed.

(cherry picked from commit a4c78ee)

(cherry picked from commit 3237f4b)

(cherry picked from commit c05270f)

(cherry picked from commit 41feb2c)

(cherry picked from commit 057c993)

(cherry picked from commit 7cf6158)

bert-e · 2023-09-13T06:16:12Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/feature/BB-413-circuit-breaker-backport with contents from feature/BB-413-circuit-breaker-backport
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/feature/BB-413-circuit-breaker-backport origin/development/8.5
 $ git merge origin/feature/BB-413-circuit-breaker-backport
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/feature/BB-413-circuit-breaker-backport

bert-e · 2023-09-13T23:33:23Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/feature/BB-413-circuit-breaker-backport with contents from w/8.5/feature/BB-413-circuit-breaker-backport
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/feature/BB-413-circuit-breaker-backport origin/development/8.6
 $ git merge origin/w/8.5/feature/BB-413-circuit-breaker-backport
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/feature/BB-413-circuit-breaker-backport

bert-e · 2023-09-14T03:19:21Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge feature/BB-413-circuit-breaker-backport into
development/7.70
w/8.5/feature/BB-413-circuit-breaker-backport will be merged into development/8.5
w/8.6/feature/BB-413-circuit-breaker-backport will be merged into development/8.6
w/8.7/feature/BB-413-circuit-breaker-backport will be merged into development/8.7

The following branches will NOT be impacted:

development/7.10
development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2023-09-14T03:19:23Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

rachedbenmustapha · 2023-09-14T03:34:00Z

/approve

bert-e · 2023-09-14T03:54:44Z

Build failed

The build for commit did not succeed in branch w/8.5/feature/BB-413-circuit-breaker-backport.

The following options are set: approve

bert-e · 2023-09-14T06:12:38Z

Build failed

The build for commit did not succeed in branch w/8.6/feature/BB-413-circuit-breaker-backport.

The following options are set: approve

bert-e · 2023-09-14T06:43:35Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/7.70
✔️ development/8.5
✔️ development/8.6
✔️ development/8.7

The following branches will NOT be impacted:

development/7.10
development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2023-09-14T06:43:48Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/7.70
✔️ development/8.5
✔️ development/8.6
✔️ development/8.7

The following branches have NOT changed:

development/7.10
development/7.4

Please check the status of the associated issue BB-413.

Goodbye rachedbenmustapha.

rachedbenmustapha force-pushed the feature/BB-413-circuit-breaker-backport branch from 2217df7 to ae56f08 Compare August 25, 2023 22:21

rachedbenmustapha marked this pull request as ready for review August 25, 2023 23:02

jonathan-gramain reviewed Sep 12, 2023

View reviewed changes

nicolas2bert approved these changes Sep 12, 2023

View reviewed changes

rachedbenmustapha added 8 commits September 13, 2023 05:47

BB-345: add breakbeat dep

7a26b80

(cherry picked from commit a4c78ee)

BB-345: plug circuit breaker into lifecycle processors

19c51fc

(cherry picked from commit 3237f4b)

BB-345: plug circuit breaker into lifecycle conductor

a74dfe9

(cherry picked from commit c05270f)

BB-345: plug circuit breaker into ingestion/replication

b4cc166

(cherry picked from commit 41feb2c)

BB-363: support implicit output queues in lifecycle circuit breakers

ddcc13c

(cherry picked from commit 057c993)

BB-415: fix implicitSingleOutputTopic param leaking into breaker conf

752c191

(cherry picked from commit 7cf6158)

BB-413: update dependencies

ffb0a38

BB-413: adapt for 7.x linter

cd499a4

rachedbenmustapha force-pushed the feature/BB-413-circuit-breaker-backport branch from ab7984a to 11eda4f Compare September 13, 2023 05:47

rachedbenmustapha added 2 commits September 13, 2023 05:49

BB-413: backport conductor checkpoint feature

8fa1aa3

BB-413: bump version

1875e1a

rachedbenmustapha force-pushed the feature/BB-413-circuit-breaker-backport branch from 11eda4f to 1875e1a Compare September 13, 2023 05:49

tmacro approved these changes Sep 13, 2023

View reviewed changes

jonathan-gramain approved these changes Sep 13, 2023

View reviewed changes

bert-e merged commit 1875e1a into development/7.70 Sep 14, 2023
3 checks passed

bert-e deleted the feature/BB-413-circuit-breaker-backport branch September 14, 2023 06:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Circuit breaker backport #2425

Circuit breaker backport #2425

rachedbenmustapha commented Jun 16, 2023

bert-e commented Jun 16, 2023

bert-e commented Jun 16, 2023

bert-e commented Aug 25, 2023

jonathan-gramain Sep 12, 2023

rachedbenmustapha Sep 12, 2023

jonathan-gramain Sep 12, 2023

bert-e commented Sep 12, 2023

nicolas2bert left a comment

bert-e commented Sep 13, 2023

bert-e commented Sep 13, 2023

bert-e commented Sep 14, 2023

bert-e commented Sep 14, 2023

rachedbenmustapha commented Sep 14, 2023

bert-e commented Sep 14, 2023

bert-e commented Sep 14, 2023

bert-e commented Sep 14, 2023

bert-e commented Sep 14, 2023

Circuit breaker backport #2425

Circuit breaker backport #2425

Conversation

rachedbenmustapha commented Jun 16, 2023

bert-e commented Jun 16, 2023

Hello rachedbenmustapha,

bert-e commented Jun 16, 2023

Incorrect fix version

bert-e commented Aug 25, 2023

Incorrect fix version

jonathan-gramain Sep 12, 2023

Choose a reason for hiding this comment

rachedbenmustapha Sep 12, 2023

Choose a reason for hiding this comment

jonathan-gramain Sep 12, 2023

Choose a reason for hiding this comment

bert-e commented Sep 12, 2023

Incorrect fix version

nicolas2bert left a comment

Choose a reason for hiding this comment

bert-e commented Sep 13, 2023

Conflict

bert-e commented Sep 13, 2023

Conflict

bert-e commented Sep 14, 2023

Integration data created

bert-e commented Sep 14, 2023

Waiting for approval

rachedbenmustapha commented Sep 14, 2023

bert-e commented Sep 14, 2023

Build failed

bert-e commented Sep 14, 2023

Build failed

bert-e commented Sep 14, 2023

In the queue

bert-e commented Sep 14, 2023