Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
13266: deps(maven): bump software.amazon.awssdk:bom from 2.20.96 to 2.20.97 r=npepinpe a=dependabot[bot]

Bumps software.amazon.awssdk:bom from 2.20.96 to 2.20.97.


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=software.amazon.awssdk:bom&package-manager=maven&previous-version=2.20.96&new-version=2.20.97)](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>

13267: deps(maven): bump grpc-bom from 1.54.1 to 1.54.2 r=npepinpe a=dependabot[bot]

Bumps [grpc-bom](https://github.com/grpc/grpc-java) from 1.54.1 to 1.54.2.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/grpc/grpc-java/commit/fbe3bb76949eed6d1d01436184ba0314ad8833d2"><code>fbe3bb7</code></a> Bump version to 1.54.2</li>
<li><a href="https://github.com/grpc/grpc-java/commit/e37a2972c8ab390b85d505cdced77286b090efff"><code>e37a297</code></a> Update README etc to reference 1.54.2</li>
<li><a href="https://github.com/grpc/grpc-java/commit/a650c6f4147890de46d7b7a260ddb5c425a0c599"><code>a650c6f</code></a> core: ManagedChannelImpl to always use RetryingNameResolver (<a href="https://redirect.github.com/grpc/grpc-java/issues/10328">#10328</a>) (<a href="https://redirect.github.com/grpc/grpc-java/issues/10330">#10330</a>)</li>
<li><a href="https://github.com/grpc/grpc-java/commit/68af073dfa9cb8ddd3c3e10f9f77422f822d134b"><code>68af073</code></a> [PSM interop] Don't fail url_map target if sub-target already failed (<a href="https://redirect.github.com/grpc/grpc-java/issues/10295">#10295</a>)...</li>
<li><a href="https://github.com/grpc/grpc-java/commit/39bd99625b240b6fc2b25ab8605ded04716bc9c7"><code>39bd996</code></a> Download Maven from Maven Central</li>
<li><a href="https://github.com/grpc/grpc-java/commit/4de4775bf848fe0d88c885602dce4147fba2f4fa"><code>4de4775</code></a> buildscripts, psm interop: Don't fail target if sub-target already failed (<a href="https://redirect.github.com/grpc/grpc-java/issues/1">#1</a>...</li>
<li><a href="https://github.com/grpc/grpc-java/commit/1c6657f940d5e87297e43fcc376bfae3921025a3"><code>1c6657f</code></a> xds interop: Update Docker images to <code>eclipse-temurin:11-jre</code> (<a href="https://redirect.github.com/grpc/grpc-java/issues/10172">#10172</a>) (<a href="https://redirect.github.com/grpc/grpc-java/issues/10183">#10183</a>)</li>
<li><a href="https://github.com/grpc/grpc-java/commit/399624164ac4f9d322614f579392893369c69907"><code>3996241</code></a> xds: Avoid default locale and reset()</li>
<li><a href="https://github.com/grpc/grpc-java/commit/1d5aff599d84c085d429ebd0d0fba2fa60dbbc4d"><code>1d5aff5</code></a> xds: Allow child of cluster_impl LB to change (<a href="https://redirect.github.com/grpc/grpc-java/issues/10091">#10091</a>) (<a href="https://redirect.github.com/grpc/grpc-java/issues/10103">#10103</a>)</li>
<li><a href="https://github.com/grpc/grpc-java/commit/b2568186438a01043890b6c7824615e3f2b580bf"><code>b256818</code></a> retries:Remove early commit for transparent retries with none remaining. (<a href="https://redirect.github.com/grpc/grpc-java/issues/10">#10</a>...</li>
<li>Additional commits viewable in <a href="https://github.com/grpc/grpc-java/compare/v1.54.1...v1.54.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=io.grpc:grpc-bom&package-manager=maven&previous-version=1.54.1&new-version=1.54.2)](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>

13274: [Backport stable/8.2] Reset the diskSpaceAvailable flag correctly r=Zelldon a=backport-action

# Description
Backport of #13260 to `stable/8.2`.

relates to #6232

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Christopher Zell <zelldon91@googlemail.com>
  • Loading branch information
3 people authored Jul 3, 2023
4 parents 2863648 + 79e54b1 + b22089a + 6a421c1 commit 120c9b7
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ public void onDiskSpaceAvailable() {
actor.call(
() -> {
context.setDiskSpaceAvailable(true);
zeebePartitionHealth.setDiskSpaceAvailable(false);
zeebePartitionHealth.setDiskSpaceAvailable(true);
if (context.getStreamProcessor() != null && context.shouldProcess()) {
LOG.info("Disk space usage is below threshold. Resuming stream processor.");
context.getStreamProcessor().resumeProcessing();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;

public class ZeebePartitionTest {
Expand Down Expand Up @@ -351,6 +352,85 @@ public void shouldCloseZeebePartitionWhileOngoingTransition() {
Awaitility.await().until(closeFuture::isDone);
}

@Test
public void shouldReportUnhealthyPerDefault() {
// given
final var captor = ArgumentCaptor.forClass(ZeebePartitionHealth.class);
schedulerRule.submitActor(partition);

// when
schedulerRule.workUntilDone();

// then
verify(healthMonitor).registerComponent(any(), captor.capture());

final var zeebePartitionHealth = captor.getValue();
final HealthReport healthReport = zeebePartitionHealth.getHealthReport();
assertThat(healthReport.getStatus()).isEqualTo(HealthStatus.UNHEALTHY);
assertThat(healthReport.getIssue().message()).contains("Initial state");
}

@Test
public void shouldReportHealthyAfterTransition() {
// given
final var captor = ArgumentCaptor.forClass(ZeebePartitionHealth.class);
schedulerRule.submitActor(partition);

// when
partition.onNewRole(Role.LEADER, 1);
schedulerRule.workUntilDone();

// then
verify(healthMonitor).registerComponent(any(), captor.capture());

final var zeebePartitionHealth = captor.getValue();
final HealthReport healthReport = zeebePartitionHealth.getHealthReport();
assertThat(healthReport.getStatus()).isEqualTo(HealthStatus.HEALTHY);
}

@Test
public void shouldReportUnhealthyWhenNoDiskAvailable() {
// given
final var captor = ArgumentCaptor.forClass(ZeebePartitionHealth.class);
schedulerRule.submitActor(partition);
partition.onNewRole(Role.LEADER, 1);
schedulerRule.workUntilDone();

// when
partition.onDiskSpaceNotAvailable();
schedulerRule.workUntilDone();

// then
verify(healthMonitor).registerComponent(any(), captor.capture());

final var zeebePartitionHealth = captor.getValue();
final HealthReport healthReport = zeebePartitionHealth.getHealthReport();
assertThat(healthReport.getStatus()).isEqualTo(HealthStatus.UNHEALTHY);
assertThat(healthReport.getIssue().message()).contains("Not enough disk space available");
}

@Test
public void shouldReportHealthyWhenDiskIsAvailableAgain() {
// given
final var captor = ArgumentCaptor.forClass(ZeebePartitionHealth.class);
schedulerRule.submitActor(partition);
partition.onNewRole(Role.LEADER, 1);
partition.onDiskSpaceNotAvailable();
schedulerRule.workUntilDone();

// when
partition.onDiskSpaceAvailable();
schedulerRule.workUntilDone();

// then
verify(healthMonitor).registerComponent(any(), captor.capture());

final var zeebePartitionHealth = captor.getValue();
final HealthReport healthReport = zeebePartitionHealth.getHealthReport();
assertThat(healthReport.getStatus()).isEqualTo(HealthStatus.HEALTHY);
assertThat(healthReport.getIssue()).isNull();
}

private static class NoopStartupStep implements PartitionStartupStep {

@Override
Expand Down
4 changes: 2 additions & 2 deletions parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<version.docker-java-api>3.2.14</version.docker-java-api>
<version.elasticsearch>7.17.9</version.elasticsearch>
<version.error-prone>2.18.0</version.error-prone>
<version.grpc>1.54.1</version.grpc>
<version.grpc>1.54.2</version.grpc>
<version.gson>2.10.1</version.gson>
<version.guava>31.1-jre</version.guava>
<version.hamcrest>2.2</version.hamcrest>
Expand Down Expand Up @@ -120,7 +120,7 @@
<version.zpt>8.1.9</version.zpt>
<version.feign>12.2</version.feign>
<version.google-sdk>26.11.0</version.google-sdk>
<version.awssdk>2.20.96</version.awssdk>
<version.awssdk>2.20.97</version.awssdk>
<version.toxiproxy>2.1.7</version.toxiproxy>
<version.validation-api>3.0.2</version.validation-api>
<version.jackson-databind-nullable>0.2.6</version.jackson-databind-nullable>
Expand Down

0 comments on commit 120c9b7

Please sign in to comment.