SOLR-16116: Remove retryOnConnLoss parameter (#3969)

This removes parameter retryOnConnLoss everywhere from the codebase. This parameter was already fully ignored since the move to Curator.

Author: psalagnac

changelog/unreleased/SOLR-16116-remove-retryOnConnLoss.yml

@@ -0,0 +1,8 @@
+title: Remove parameter retryOnConnLoss everywhere from the codebase. This parameter
+  was already fully ignored since the move to Curator.
+type: removed
+authors:
+  - name: Pierre Salagnac
+links:
+  - name: SOLR-16116
+    url: https://issues.apache.org/jira/browse/SOLR-16116

solr/core/src/java/org/apache/solr/api/ZkClusterPluginsSource.java

@@ -71,7 +71,7 @@ public Map<String, Object> plugins() throws IOException {
     try {
       Map<String, Object> clusterPropsJson =
           (Map<String, Object>)
-              Utils.fromJSON(zkClient.getData(ZkStateReader.CLUSTER_PROPS, null, new Stat(), true));
+              Utils.fromJSON(zkClient.getData(ZkStateReader.CLUSTER_PROPS, null, new Stat()));
       return Map.copyOf(
           (Map<String, Object>)
               clusterPropsJson.computeIfAbsent(

solr/core/src/java/org/apache/solr/cli/AuthTool.java

@@ -249,7 +249,7 @@ private void handleBasicAuth(CommandLine cli) throws Exception {
         if (!updateIncludeFileOnly) {
           echoIfVerbose("Uploading following security.json: " + securityJson);
           try (SolrZkClient zkClient = CLIUtils.getSolrZkClient(cli, zkHost)) {
-            zkClient.setData("/security.json", securityJson.getBytes(StandardCharsets.UTF_8), true);
+            zkClient.setData("/security.json", securityJson.getBytes(StandardCharsets.UTF_8));
           }
         }
 
@@ -309,8 +309,8 @@ private void handleBasicAuth(CommandLine cli) throws Exception {
 
   private void checkSecurityJsonExists(SolrZkClient zkClient)
       throws KeeperException, InterruptedException {
-    if (zkClient.exists("/security.json", true)) {
-      byte[] oldSecurityBytes = zkClient.getData("/security.json", null, null, true);
+    if (zkClient.exists("/security.json")) {
+      byte[] oldSecurityBytes = zkClient.getData("/security.json", null, null);
       if (!"{}".equals(new String(oldSecurityBytes, StandardCharsets.UTF_8).trim())) {
         CLIO.out(
             "Security is already enabled. You can disable it with 'bin/solr auth disable'. Existing security.json: \n"
@@ -332,7 +332,7 @@ private void clearSecurityJson(CommandLine cli, boolean updateIncludeFileOnly) t
       echoIfVerbose("Uploading following security.json: {}");
 
       try (SolrZkClient zkClient = CLIUtils.getSolrZkClient(cli, zkHost)) {
-        zkClient.setData("/security.json", "{}".getBytes(StandardCharsets.UTF_8), true);
+        zkClient.setData("/security.json", "{}".getBytes(StandardCharsets.UTF_8));
       }
     }
   }

solr/core/src/java/org/apache/solr/cli/CreateTool.java

@@ -248,9 +248,7 @@ protected void createCollection(CloudSolrClient cloudSolrClient, CommandLine cli
     boolean configExistsInZk =
         confName != null
             && !confName.trim().isEmpty()
-            && ZkStateReader.from(cloudSolrClient)
-                .getZkClient()
-                .exists("/configs/" + confName, true);
+            && ZkStateReader.from(cloudSolrClient).getZkClient().exists("/configs/" + confName);
 
     if (configExistsInZk) {
       echo("Re-using existing configuration directory " + confName);

solr/core/src/java/org/apache/solr/cli/ZkMkrootTool.java

@@ -79,7 +79,7 @@ public void runImpl(CommandLine cli) throws Exception {
       echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...");
 
       echo("Creating ZooKeeper path " + znode + " on ZooKeeper at " + zkHost);
-      zkClient.makePath(znode, failOnExists, true);
+      zkClient.makePath(znode, failOnExists);
     } catch (Exception e) {
       log.error("Could not complete mkroot operation for reason: ", e);
       throw (e);

solr/core/src/java/org/apache/solr/cli/ZkRmTool.java

@@ -67,7 +67,7 @@ public void runImpl(CommandLine cli) throws Exception {
     }
     echoIfVerbose("\nConnecting to ZooKeeper at " + zkHost + " ...");
     try (SolrZkClient zkClient = CLIUtils.getSolrZkClient(cli, zkHost)) {
-      if (!recursive && zkClient.getChildren(znode, null, true).size() != 0) {
+      if (!recursive && zkClient.getChildren(znode, null).size() != 0) {
         throw new SolrServerException(
             "ZooKeeper node " + znode + " has children and recursive has NOT been specified.");
       }

solr/core/src/java/org/apache/solr/cloud/CloudUtil.java

@@ -129,10 +129,10 @@ public static String unifiedResourcePath(SolrResourceLoader loader) {
   public static Map<String, byte[]> getTrustedKeys(SolrZkClient zk, String dir) {
     Map<String, byte[]> result = new HashMap<>();
     try {
-      List<String> children = zk.getChildren("/keys/" + dir, null, true);
+      List<String> children = zk.getChildren("/keys/" + dir, null);
       for (String key : children) {
         if (key.endsWith(".der"))
-          result.put(key, zk.getData("/keys/" + dir + "/" + key, null, null, true));
+          result.put(key, zk.getData("/keys/" + dir + "/" + key, null, null));
       }
     } catch (KeeperException.NoNodeException e) {
       log.info("Error fetching key names");

solr/core/src/java/org/apache/solr/cloud/DistributedApiAsyncTracker.java

@@ -323,8 +323,8 @@ enum State {
       this.rootNodePath = rootNodePath;
 
       try {
-        if (!zkClient.exists(rootNodePath, true)) {
-          zkClient.makePath(rootNodePath, new byte[0], CreateMode.PERSISTENT, true);
+        if (!zkClient.exists(rootNodePath)) {
+          zkClient.makePath(rootNodePath, new byte[0], CreateMode.PERSISTENT);
         }
       } catch (KeeperException.NodeExistsException nee) {
         // Some other thread (on this or another JVM) beat us to create the node, that's ok, the
@@ -341,27 +341,25 @@ void createNewInFlightTask(String asyncId) throws KeeperException, InterruptedEx
       zkClient.create(
           getPath(asyncId),
           State.SUBMITTED.shorthand.getBytes(StandardCharsets.UTF_8),
-          CreateMode.EPHEMERAL,
-          true);
+          CreateMode.EPHEMERAL);
     }
 
     void setTaskRunning(String asyncId) throws KeeperException, InterruptedException {
-      zkClient.setData(
-          getPath(asyncId), State.RUNNING.shorthand.getBytes(StandardCharsets.UTF_8), true);
+      zkClient.setData(getPath(asyncId), State.RUNNING.shorthand.getBytes(StandardCharsets.UTF_8));
     }
 
     void deleteInFlightTask(String asyncId) throws KeeperException, InterruptedException {
-      zkClient.delete(getPath(asyncId), -1, true);
+      zkClient.delete(getPath(asyncId), -1);
     }
 
     State getInFlightState(String asyncId) throws KeeperException, InterruptedException {
-      if (!zkClient.exists(getPath(asyncId), true)) {
+      if (!zkClient.exists(getPath(asyncId))) {
         return State.NOT_FOUND;
       }
 
       final byte[] bytes;
       try {
-        bytes = zkClient.getData(getPath(asyncId), null, null, true);
+        bytes = zkClient.getData(getPath(asyncId), null, null);
       } catch (KeeperException.NoNodeException nne) {
         // Unlikely race, but not impossible...
         if (log.isInfoEnabled()) {

solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java

@@ -552,7 +552,7 @@ private void doStateDotJsonCasUpdate(ClusterState updatedState)
         if (updater.isCollectionCreation()) {
           // The state.json file does not exist yet (more precisely it is assumed not to exist)
           log.debug("going to create collection {}", jsonPath);
-          zkStateReader.getZkClient().create(jsonPath, stateJson, CreateMode.PERSISTENT, true);
+          zkStateReader.getZkClient().create(jsonPath, stateJson, CreateMode.PERSISTENT);
         } else {
           // We're updating an existing state.json
           if (log.isDebugEnabled()) {
@@ -561,9 +561,7 @@ private void doStateDotJsonCasUpdate(ClusterState updatedState)
                 jsonPath,
                 collection.getZNodeVersion());
           }
-          zkStateReader
-              .getZkClient()
-              .setData(jsonPath, stateJson, collection.getZNodeVersion(), true);
+          zkStateReader.getZkClient().setData(jsonPath, stateJson, collection.getZNodeVersion());
         }
       }
     }
@@ -577,7 +575,7 @@ private void doStateDotJsonCasUpdate(ClusterState updatedState)
     private ClusterState fetchStateForCollection() throws KeeperException, InterruptedException {
       String collectionStatePath = DocCollection.getCollectionPath(updater.getCollectionName());
       Stat stat = new Stat();
-      byte[] data = zkStateReader.getZkClient().getData(collectionStatePath, null, stat, true);
+      byte[] data = zkStateReader.getZkClient().getData(collectionStatePath, null, stat);
 
       // This factory method can detect a missing configName and supply it by reading it from the
       // old ZK location.
@@ -890,7 +888,7 @@ public static void executeNodeDownStateUpdate(String nodeName, ZkStateReader zkS
 
       try {
         final List<String> collectionNames =
-            zkStateReader.getZkClient().getChildren(COLLECTIONS_ZKNODE, null, true);
+            zkStateReader.getZkClient().getChildren(COLLECTIONS_ZKNODE, null);
 
         // Collections are totally independent of each other. Multiple threads could share the load
         // here (need a ZK connection for each though).

solr/core/src/java/org/apache/solr/cloud/DistributedMap.java

@@ -68,8 +68,7 @@ private void assertKeyFormat(String trackingId) {
 
   public void put(String trackingId, byte[] data) throws KeeperException, InterruptedException {
     assertKeyFormat(trackingId);
-    zookeeper.makePath(
-        dir + "/" + PREFIX + trackingId, data, CreateMode.PERSISTENT, null, false, true);
+    zookeeper.makePath(dir + "/" + PREFIX + trackingId, data, CreateMode.PERSISTENT, null, false);
   }
 
   /**
@@ -81,25 +80,24 @@ public boolean putIfAbsent(String trackingId, byte[] data)
       throws KeeperException, InterruptedException {
     assertKeyFormat(trackingId);
     try {
-      zookeeper.makePath(
-          dir + "/" + PREFIX + trackingId, data, CreateMode.PERSISTENT, null, true, true);
+      zookeeper.makePath(dir + "/" + PREFIX + trackingId, data, CreateMode.PERSISTENT, null, true);
       return true;
     } catch (NodeExistsException e) {
       return false;
     }
   }
 
   public byte[] get(String trackingId) throws KeeperException, InterruptedException {
-    return zookeeper.getData(dir + "/" + PREFIX + trackingId, null, null, true);
+    return zookeeper.getData(dir + "/" + PREFIX + trackingId, null, null);
   }
 
   public boolean contains(String trackingId) throws KeeperException, InterruptedException {
-    return zookeeper.exists(dir + "/" + PREFIX + trackingId, true);
+    return zookeeper.exists(dir + "/" + PREFIX + trackingId);
   }
 
   public int size() throws KeeperException, InterruptedException {
     Stat stat = new Stat();
-    zookeeper.getData(dir, null, stat, true);
+    zookeeper.getData(dir, null, stat);
     return stat.getNumChildren();
   }
 
@@ -110,7 +108,7 @@ public int size() throws KeeperException, InterruptedException {
   public boolean remove(String trackingId) throws KeeperException, InterruptedException {
     final var path = dir + "/" + PREFIX + trackingId;
     try {
-      zookeeper.delete(path, -1, true);
+      zookeeper.delete(path, -1);
     } catch (KeeperException.NoNodeException e) {
       return false;
     } catch (KeeperException.NotEmptyException hack) {
@@ -123,15 +121,15 @@ public boolean remove(String trackingId) throws KeeperException, InterruptedExce
 
   /** Helper method to clear all child nodes for a parent node. */
   public void clear() throws KeeperException, InterruptedException {
-    List<String> childNames = zookeeper.getChildren(dir, null, true);
+    List<String> childNames = zookeeper.getChildren(dir, null);
     for (String childName : childNames) {
-      zookeeper.delete(dir + "/" + childName, -1, true);
+      zookeeper.delete(dir + "/" + childName, -1);
     }
   }
 
   /** Returns the keys of all the elements in the map */
   public Collection<String> keys() throws KeeperException, InterruptedException {
-    List<String> childs = zookeeper.getChildren(dir, null, true);
+    List<String> childs = zookeeper.getChildren(dir, null);
     final List<String> ids = new ArrayList<>(childs.size());
     childs.stream().forEach((child) -> ids.add(child.substring(PREFIX.length())));
     return ids;