Skip to content

fix: ensure B/G monitor instances are set up #1612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2025
+14 −6
Merged

fix: ensure B/G monitor instances are set up #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions wrapper/src/main/java/software/amazon/jdbc/plugin/bluegreen/BlueGreenStatusMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ public BlueGreenStatusMonitor(
this.onBlueGreenStatusChangeFunc = onBlueGreenStatusChangeFunc;

this.blueGreenDialect = (BlueGreenDialect) this.pluginService.getDialect();
}

public void start() {
executorService.submit(this::runMonitoringLoop);
executorService.shutdown(); // executor accepts no more tasks
}
Expand Down
18 changes: 12 additions & 6 deletions wrapper/src/main/java/software/amazon/jdbc/plugin/bluegreen/BlueGreenStatusProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
Expand Down Expand Up @@ -158,7 +159,7 @@ public BlueGreenStatusProvider(
}

protected void initMonitoring() {
monitors[BlueGreenRole.SOURCE.getValue()] =
final BlueGreenStatusMonitor sourceMonitor =
new BlueGreenStatusMonitor(
BlueGreenRole.SOURCE,
this.bgdId,
Expand All @@ -167,7 +168,10 @@ protected void initMonitoring() {
this.getMonitoringProperties(),
statusCheckIntervalMap,
this::prepareStatus);
monitors[BlueGreenRole.TARGET.getValue()] =
monitors[BlueGreenRole.SOURCE.getValue()] = sourceMonitor;
sourceMonitor.start();

final BlueGreenStatusMonitor targetMonitor =
new BlueGreenStatusMonitor(
BlueGreenRole.TARGET,
this.bgdId,
Expand All @@ -176,6 +180,8 @@ protected void initMonitoring() {
this.getMonitoringProperties(),
statusCheckIntervalMap,
this::prepareStatus);
monitors[BlueGreenRole.TARGET.getValue()] = targetMonitor;
targetMonitor.start();
}

protected Properties getMonitoringProperties() {
Expand Down Expand Up @@ -448,15 +454,15 @@ protected void updateSummaryStatus(BlueGreenRole role, BlueGreenInterimStatus in
protected void updateMonitors() {
switch (this.summaryStatus.getCurrentPhase()) {
case NOT_CREATED:
Arrays.stream(this.monitors).forEach(x -> {
Arrays.stream(this.monitors).filter(Objects::nonNull).forEach(x -> {
x.setIntervalRate(BlueGreenIntervalRate.BASELINE);
x.setCollectIpAddresses(false);
x.setCollectTopology(false);
x.setUseIpAddress(false);
});
break;
case CREATED:
Arrays.stream(this.monitors).forEach(x -> {
Arrays.stream(this.monitors).filter(Objects::nonNull).forEach(x -> {
x.setIntervalRate(BlueGreenIntervalRate.INCREASED);
x.setCollectIpAddresses(true);
x.setCollectTopology(true);
Expand All @@ -469,15 +475,15 @@ protected void updateMonitors() {
case PREPARATION:
case IN_PROGRESS:
case POST:
Arrays.stream(this.monitors).forEach(x -> {
Arrays.stream(this.monitors).filter(Objects::nonNull).forEach(x -> {
x.setIntervalRate(BlueGreenIntervalRate.HIGH);
x.setCollectIpAddresses(false);
x.setCollectTopology(false);
x.setUseIpAddress(true);
});
break;
case COMPLETED:
Arrays.stream(this.monitors).forEach(x -> {
Arrays.stream(this.monitors).filter(Objects::nonNull).forEach(x -> {
x.setIntervalRate(BlueGreenIntervalRate.BASELINE);
x.setCollectIpAddresses(false);
x.setCollectTopology(false);
Expand Down
Loading