Skip to content

Commit

Permalink
merge: #9139 #9149 #9150
Browse files Browse the repository at this point in the history
9139: fix: remove subscription consumer instead of re-registering r=oleschoenburg a=oleschoenburg

This was probably not an issue because it was mitigated by other circumstances.

closes #9123 


9149: deps(maven): bump netty-bom from 4.1.75.Final to 4.1.76.Final r=npepinpe a=dependabot[bot]

Bumps [netty-bom](https://github.com/netty/netty) from 4.1.75.Final to 4.1.76.Final.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/netty/netty/commit/701263610a72725c9d32b4022f1d51b1344890d1"><code>7012636</code></a> [maven-release-plugin] prepare release netty-4.1.76.Final</li>
<li><a href="https://github.com/netty/netty/commit/1ecc053e70d57a8da70bf23bf5293b2072337b09"><code>1ecc053</code></a> Log specific exception to debug ParameterizedSslHandlerTest (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12290">#12290</a>)</li>
<li><a href="https://github.com/netty/netty/commit/cf8b7170505c2329b34ff1f8c0b76977a4d7c2c2"><code>cf8b717</code></a> Cope with misbehaving Http2Headers implementations (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12289">#12289</a>)</li>
<li><a href="https://github.com/netty/netty/commit/a9cac5ee0b921deaa51758f038f9316ca821616a"><code>a9cac5e</code></a> Share code and improve logging (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12282">#12282</a>)</li>
<li><a href="https://github.com/netty/netty/commit/005a6a4e7b3632d6719640eac621690d3268fd1f"><code>005a6a4</code></a> Correctly encode result even if no timeout is used (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12283">#12283</a>)</li>
<li><a href="https://github.com/netty/netty/commit/5e23212172a761c416ec682c55f462852c381e92"><code>5e23212</code></a> Break loop early if possible (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12254">#12254</a>)</li>
<li><a href="https://github.com/netty/netty/commit/960121db545f2d8aec7a87da8c54a9645fde266c"><code>960121d</code></a> Allow explicit choice of internet family (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12270">#12270</a>)</li>
<li><a href="https://github.com/netty/netty/commit/afbf8d26b17548896b55d4edbcdcc4f8bb625a7d"><code>afbf8d2</code></a> Upgrade to <code>Brotli4j</code> 1.7.1 and use new <code>ByteBuf</code> API (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12264">#12264</a>)</li>
<li><a href="https://github.com/netty/netty/commit/34ae67a5b1fb1f119c1ed509f576c205d1e7fd78"><code>34ae67a</code></a> Bump Log4j2 to 2.17.2 (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12261">#12261</a>)</li>
<li><a href="https://github.com/netty/netty/commit/19d74affb0bc88118d64737df10569ac41ae1804"><code>19d74af</code></a> Automatically use boringssl-static when compiling on Mac M1 (<a href="https://github-redirect.dependabot.com/netty/netty/issues/12256">#12256</a>)</li>
<li>Additional commits viewable in <a href="https://github.com/netty/netty/compare/netty-4.1.75.Final...netty-4.1.76.Final">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=io.netty:netty-bom&package-manager=maven&previous-version=4.1.75.Final&new-version=4.1.76.Final)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

9150: deps(maven): bump proto-google-common-protos from 2.8.2 to 2.8.3 r=npepinpe a=dependabot[bot]

Bumps [proto-google-common-protos](https://github.com/googleapis/java-iam) from 2.8.2 to 2.8.3.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/googleapis/java-iam/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.api.grpc:proto-google-common-protos&package-manager=maven&previous-version=2.8.2&new-version=2.8.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- ``@dependabot` rebase` will rebase this PR
- ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it
- ``@dependabot` merge` will merge this PR after your CI passes on it
- ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it
- ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging
- ``@dependabot` reopen` will reopen this PR if it is closed
- ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed Apr 14, 2022
4 parents 15621f1 + 08fee85 + dbc4c44 + f166fbd commit 7483104
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void registerConsumer(final ActorCondition consumer) {

@Override
public void removeConsumer(final ActorCondition consumer) {
actorConditions.registerConsumer(consumer);
actorConditions.removeConsumer(consumer);
}

protected long getLimit() {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH under
* one or more contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright ownership.
* Licensed under the Zeebe Community License 1.1. You may not use this file
* except in compliance with the Zeebe Community License 1.1.
*/
package io.camunda.zeebe.dispatcher;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;

import io.camunda.zeebe.dispatcher.impl.log.LogBuffer;
import io.camunda.zeebe.util.sched.ActorCondition;
import org.junit.jupiter.api.Test;

final class SubscriptionConsumerTest {

@Test
void consumersAreSignaledAfterRegistering() {
// given
final var consumer = mock(ActorCondition.class);
final var subscription =
new Subscription(
mock(AtomicPosition.class),
mock(AtomicPosition.class),
0,
"",
mock(ActorCondition.class),
mock(LogBuffer.class));

// when
subscription.registerConsumer(consumer);

// then
subscription.getActorConditions().signalConsumers();
verify(consumer).signal();
}

@Test
void consumersAreNotSignaledAfterRemoving() {
// given
final var consumer = mock(ActorCondition.class);
final var subscription =
new Subscription(
mock(AtomicPosition.class),
mock(AtomicPosition.class),
0,
"",
mock(ActorCondition.class),
mock(LogBuffer.class));
subscription.registerConsumer(consumer);

// when
subscription.removeConsumer(consumer);

// then
subscription.getActorConditions().signalConsumers();
verifyNoInteractions(consumer);
}
}
4 changes: 2 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
<version.mockito-jupiter>4.4.0</version.mockito-jupiter>
<version.model>7.7.0</version.model>
<version.msgpack>0.9.1</version.msgpack>
<version.netty>4.1.75.Final</version.netty>
<version.netty>4.1.76.Final</version.netty>
<version.objenesis>3.2</version.objenesis>
<version.prometheus>0.15.0</version.prometheus>
<version.protobuf>3.20.0</version.protobuf>
<version.protobuf-common>2.8.2</version.protobuf-common>
<version.protobuf-common>2.8.3</version.protobuf-common>
<version.micrometer>1.8.4</version.micrometer>
<version.rocksdbjni>7.0.4</version.rocksdbjni>
<version.sbe>1.25.2</version.sbe>
Expand Down

0 comments on commit 7483104

Please sign in to comment.