This is an automated email from the ASF dual-hosted git repository.
sarankk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new ff7952662 CASSSIDECAR-506: Report unknown node status as "Unknown"
instead of ? in ring and token range replica responses (#391)
ff7952662 is described below
commit ff79526628b75b43cc0a286daf75ee3f44fef261
Author: Mansi Khara <[email protected]>
AuthorDate: Thu Oct 8 18:57:37 2026 -0400
CASSSIDECAR-506: Report unknown node status as "Unknown" instead of ? in
ring and token range replica responses (#391)
Patch by Mansi Khara; Reviewed by Yifan Cai, Saranya Krishnakumar for
CASSSIDECAR-506
---
CHANGES.txt | 1 +
.../sidecar/adapters/base/RingProvider.java | 3 +-
.../sidecar/adapters/base/RingProviderTest.java | 61 ++++++++++++++++++++++
3 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index b36b0bba9..d1df53b35 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.5.0
-----
+ * Report unknown node status as "Unknown" instead of "?" in ring and token
range replica responses (CASSSIDECAR-506)
* Remove unused Instance Metadata Fetcher from CdcDatabaseAccessor
(CASSSIDECAR-497)
* Fix IPV6 regex to recognize bracketed addresses in gossip info host headers
(CASSSIDECAR-503)
* CDC batch-write mixing a CDC-enabled and CDC-disabled table drops the CDC
table's mutation (CASSSIDECAR-499)
diff --git
a/adapters/adapters-base/src/main/java/org/apache/cassandra/sidecar/adapters/base/RingProvider.java
b/adapters/adapters-base/src/main/java/org/apache/cassandra/sidecar/adapters/base/RingProvider.java
index 8cc9dce92..1cde61b20 100644
---
a/adapters/adapters-base/src/main/java/org/apache/cassandra/sidecar/adapters/base/RingProvider.java
+++
b/adapters/adapters-base/src/main/java/org/apache/cassandra/sidecar/adapters/base/RingProvider.java
@@ -175,7 +175,8 @@ public class RingProvider
return NodeStatus.UP.displayName();
if (deadNodes.contains(endpoint))
return NodeStatus.DOWN.displayName();
- return UNKNOWN_SHORT;
+ // Report "Unknown" rather than "?" so clients can parse the
status as an enum value
+ return UNKNOWN;
}
}
diff --git
a/adapters/adapters-base/src/test/java/org/apache/cassandra/sidecar/adapters/base/RingProviderTest.java
b/adapters/adapters-base/src/test/java/org/apache/cassandra/sidecar/adapters/base/RingProviderTest.java
new file mode 100644
index 000000000..37b8fc87d
--- /dev/null
+++
b/adapters/adapters-base/src/test/java/org/apache/cassandra/sidecar/adapters/base/RingProviderTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.sidecar.adapters.base;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Unit tests for {@link RingProvider}
+ */
+class RingProviderTest
+{
+ private static final String LIVE_NODE = "127.0.0.1:7000";
+ private static final String DEAD_NODE = "127.0.0.2:7000";
+ private static final String UNCLASSIFIED_NODE = "127.0.0.3:7000";
+
+ @Test
+ void testStatusOfLiveAndDeadNodes()
+ {
+ RingProvider.Status status = new
RingProvider.Status(List.of(LIVE_NODE), List.of(DEAD_NODE));
+
+ assertThat(status.of(LIVE_NODE)).isEqualTo("Up");
+ assertThat(status.of(DEAD_NODE)).isEqualTo("Down");
+ }
+
+ @Test
+ void testStatusOfNodeNeitherLiveNorDeadIsUnknown()
+ {
+ RingProvider.Status status = new
RingProvider.Status(List.of(LIVE_NODE), List.of(DEAD_NODE));
+
+ // Clients parse the status into an enum, so it must not be "?"
+ assertThat(status.of(UNCLASSIFIED_NODE)).isEqualTo("Unknown");
+ }
+
+ @Test
+ void testStateOfNodeNeitherJoiningLeavingNorMovingIsNormal()
+ {
+ RingProvider.State state = new RingProvider.State(List.of(),
List.of(), List.of());
+
+ assertThat(state.of(UNCLASSIFIED_NODE)).isEqualTo("Normal");
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
