Skip to content

CASSSIDECAR-395: Returning JSON response for live migration status endpoints when returning error status codes #307

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
frankgh merged 2 commits into from
Jan 7, 2026
Merged

CASSSIDECAR-395: Returning JSON response for live migration status endpoints when returning error status codes #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c612a1
CASSSIDECAR-395 Returning JSON response for live migration status end…
nvharikrishna Dec 31, 2025
59c86e8
Updated CHANGES.txt
nvharikrishna Jan 5, 2026
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
1 change: 1 addition & 0 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.3.0
-----
* Returning JSON responses for live migration status endpoints in case of errors (CASSSIDECAR-395)
* Upgrade vertx to 4.5.23 (CASSSIDECAR-391)
* Fix for deadlock during JMX reconnection (CASSSIDECAR-390)
* Fix request execution continues on wrong thread (CASSSIDECAR-368)
Expand Down
15 changes: 8 additions & 7 deletions ...g/apache/cassandra/sidecar/handlers/livemigration/LiveMigrationStatusCompleteHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import com.google.inject.Inject;
import com.google.inject.Singleton;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.Future;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.json.Json;
Expand All @@ -43,6 +42,10 @@
import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
import org.jetbrains.annotations.NotNull;

import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE;
import static org.apache.cassandra.sidecar.utils.HttpExceptions.wrapHttpException;

/**
* Handler to safely mark a live migration as COMPLETED for an instance.
* <p>
Expand Down Expand Up @@ -113,15 +116,13 @@ protected void handleInternal(RoutingContext routingContext, HttpServerRequest h
instanceMetadata.host(), e);
if (e instanceof IllegalStateException)
{
routingContext.response()
.setStatusCode(HttpResponseStatus.BAD_REQUEST.code())
.end("Live migration marked as COMPLETED earlier.");
routingContext.fail(wrapHttpException(BAD_REQUEST,
"Live migration marked as COMPLETED earlier."));
}
else
{
routingContext.response()
.setStatusCode(HttpResponseStatus.SERVICE_UNAVAILABLE.code())
.end("Could not update Live Migration as complete.");
routingContext.fail(wrapHttpException(SERVICE_UNAVAILABLE,
"Could not update Live Migration as complete."));
}
});
}
Expand Down
9 changes: 5 additions & 4 deletions ...va/org/apache/cassandra/sidecar/handlers/livemigration/LiveMigrationStatusGetHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import com.google.inject.Inject;
import com.google.inject.Singleton;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.net.SocketAddress;
import io.vertx.ext.auth.authorization.Authorization;
Expand All @@ -37,6 +36,9 @@
import org.apache.cassandra.sidecar.utils.InstanceMetadataFetcher;
import org.jetbrains.annotations.NotNull;

import static io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE;
import static org.apache.cassandra.sidecar.utils.HttpExceptions.wrapHttpException;

/**
* Handler to retrieve the current live migration status for an instance.
* <p>
Expand Down Expand Up @@ -73,9 +75,8 @@ protected void handleInternal(RoutingContext routingContext, HttpServerRequest h
InstanceMetadata instance = metadataFetcher.instance(host);
statusTracker.getMigrationStatus(instance)
.compose(routingContext::json)
.onFailure(e -> routingContext.response()
.setStatusCode(HttpResponseStatus.SERVICE_UNAVAILABLE.code())
.end(e.getMessage()));
.onFailure(e -> routingContext.fail(wrapHttpException(SERVICE_UNAVAILABLE,
e.getMessage())));
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions .../org/apache/cassandra/sidecar/handlers/livemigration/LiveMigrationStatusHandlersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ void testUpdatingStatusSecondTimeShouldFail(VertxTestContext context)
.send()
.compose(response -> {
assertThat(response.statusCode()).isEqualTo(HttpResponseStatus.BAD_REQUEST.code());
assertThat(response.bodyAsJsonObject()).isNotNull();
return Future.succeededFuture();
}))
.onSuccess(r -> context.completeNow())
Expand Down Expand Up @@ -251,6 +252,7 @@ void testCompleteStatusShouldNotSucceedWhenFetchingMigrationMapFails(VertxTestCo
.send()
.compose(response -> {
assertThat(response.statusCode()).isEqualTo(HttpResponseStatus.SERVICE_UNAVAILABLE.code());
assertThat(response.bodyAsJsonObject()).isNotNull();
return Future.succeededFuture();
})
.onSuccess(r -> context.completeNow())
Expand Down