Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14752: Fix error in Zookeeper status when Prometheus plugin is enabled in ZK 

Signed-off-by: Jan Høydahl <janhoy@apache.org>
This commit is contained in:
Philipp Trulson 2020-08-26 10:03:42 +02:00 committed by Jan Høydahl
parent 6abce32a3e
commit f4c4fbcafc
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -195,6 +195,8 @@ Bug Fixes
* SOLR-14700: Avoid NullPointerException in TupleStream.getShards() when streamContext is null. * SOLR-14700: Avoid NullPointerException in TupleStream.getShards() when streamContext is null.
(Mads Bondo Dydensborg, Christine Poerschke, Mike Drob) (Mads Bondo Dydensborg, Christine Poerschke, Mike Drob)
* SOLR-14752: Fix error in Zookeeper status when Prometheus plugin is enabled in ZK (Philipp Trulson via janhoy)
Other Changes Other Changes
--------------------- ---------------------

4
solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java
View File

@ -156,8 +156,8 @@ public class ZookeeperStatusHandler extends RequestHandlerBase {
} else if ("leader".equals(state)) { } else if ("leader".equals(state)) {
leaders++; leaders++;
reportedFollowers = Math.max( reportedFollowers = Math.max(
Integer.parseInt((String) stat.getOrDefault("zk_followers", "0")), (int) Float.parseFloat((String) stat.getOrDefault("zk_followers", "0")),
Integer.parseInt((String) stat.getOrDefault("zk_synced_followers", "0")) (int) Float.parseFloat((String) stat.getOrDefault("zk_synced_followers", "0"))
); );
} else if ("standalone".equals(state)) { } else if ("standalone".equals(state)) {
standalone++; standalone++;

35
solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
View File

@ -211,4 +211,39 @@ public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {
" \"status\":\"red\"}"; " \"status\":\"red\"}";
assertEquals(expected, JSONUtil.toJSON(mockStatus)); assertEquals(expected, JSONUtil.toJSON(mockStatus));
} }
@Test
public void testZkWithPrometheusSolr14752() {
assumeWorkingMockito();
ZookeeperStatusHandler zkStatusHandler = mock(ZookeeperStatusHandler.class);
when(zkStatusHandler.getZkRawResponse("zoo1:2181", "ruok")).thenReturn(Arrays.asList("imok"));
when(zkStatusHandler.getZkRawResponse("zoo1:2181", "mntr")).thenReturn(
Arrays.asList("zk_version\t3.6.1--104dcb3e3fb464b30c5186d229e00af9f332524b, built on 04/21/2020 15:01 GMT",
"zk_avg_latency\t0.24",
"zk_server_state\tleader",
"zk_synced_followers\t0.0"));
when(zkStatusHandler.getZkRawResponse("zoo1:2181", "conf")).thenReturn(
Arrays.asList("clientPort=2181"));
when(zkStatusHandler.getZkStatus(anyString(), any())).thenCallRealMethod();
when(zkStatusHandler.monitorZookeeper(anyString())).thenCallRealMethod();
when(zkStatusHandler.validateZkRawResponse(ArgumentMatchers.any(), any(), any())).thenAnswer(Answers.CALLS_REAL_METHODS);
// Verifying that parsing the status strings with floating point no longer triggers a NumberFormatException, although floats are still displayed in UI
Map<String, Object> mockStatus = zkStatusHandler.getZkStatus("zoo1:2181", ZkDynamicConfig.fromZkConnectString("zoo1:2181"));
String expected = "{\n" +
" \"mode\":\"ensemble\",\n" +
" \"dynamicReconfig\":true,\n" +
" \"ensembleSize\":1,\n" +
" \"details\":[{\n" +
" \"zk_synced_followers\":\"0.0\",\n" +
" \"zk_version\":\"3.6.1--104dcb3e3fb464b30c5186d229e00af9f332524b, built on 04/21/2020 15:01 GMT\",\n" +
" \"zk_avg_latency\":\"0.24\",\n" +
" \"host\":\"zoo1:2181\",\n" +
" \"clientPort\":\"2181\",\n" +
" \"ok\":true,\n" +
" \"zk_server_state\":\"leader\"}],\n" +
" \"zkHost\":\"zoo1:2181\",\n" +
" \"status\":\"green\"}";
assertEquals(expected, JSONUtil.toJSON(mockStatus));
}
} }