Upgrade Guava library to version 32.0.0-jre-router pod by AbhishekKumar9984 · Pull Request #16118 · cdapio/cdap

AbhishekKumar9984 · 2026-05-05T09:51:38Z

Updated the Guava dependency version in pom.xml to 32.0.0-jre.
Ensured compatibility with the upgraded Guava version.

dheeraj-kholia-cs · 2026-05-26T03:39:18Z

+        Object future = service.getClass().getMethod("start").invoke(service);
+        if (future instanceof ListenableFuture) {
+          ((ListenableFuture<?>) future).get();
+        }


Why are we using reflection to call method of service?

dheeraj-kholia-cs · 2026-05-26T03:40:28Z

+        service.getClass().getMethod("awaitTerminated").invoke(service);
+      } catch (NoSuchMethodException e) {
+        // Guava 13
+        Object future = service.getClass().getMethod("stop").invoke(service);


We anyways are upgrading to guava 32.0.0, which won't be compatible to older 12 or 13 versions.
Do we need to handle this exception?

dheeraj-kholia-cs · 2026-05-26T03:41:20Z

    // If internal authorization enforcement is enabled, we avoid re-initialization of the token manager.
    if (SecurityUtil.isManagedSecurity(cConf) && !SecurityUtil.isInternalAuthEnabled(cConf)) {
-      tokenValidator.startAndWait();
+      io.cdap.cdap.common.service.Services.startAndWait(tokenValidator);


add import statement

dheeraj-kholia-cs · 2026-05-26T03:41:33Z

    if (SecurityUtil.isManagedSecurity(cConf) && !SecurityUtil.isInternalAuthEnabled(cConf)) {
-      tokenValidator.stopAndWait();
+      io.cdap.cdap.common.service.Services.stopAndWait(tokenValidator);
+


add this in import

dheeraj-kholia-cs · 2026-05-26T03:42:10Z

    } catch (Throwable t) {
      LOG.error(t.getMessage(), t);
-      throw Throwables.propagate(t);
+      throw new RuntimeException(t);


also add Throwables.propagateIfUnchecked

dheeraj-kholia-cs · 2026-05-26T03:42:22Z

                + "cdap-site.xml. Currently configured as: %s",
            zkClientService.getConnectString()));
-    router.startAndWait();
+    io.cdap.cdap.common.service.Services.startAndWait(router);


add this to import

dheeraj-kholia-cs · 2026-05-26T03:42:34Z

    datasetService = injector.getInstance(DatasetService.class);
-    datasetService.startAndWait();
+    io.cdap.cdap.common.service.Services.startAndWait(datasetService);



same as above

dheeraj-kholia-cs · 2026-05-26T03:43:00Z

+    io.cdap.cdap.common.service.Services.stopAndWait(logQueryService);
+    io.cdap.cdap.common.service.Services.stopAndWait(datasetService);
+    io.cdap.cdap.common.service.Services.stopAndWait(dsOpService);
+    io.cdap.cdap.common.service.Services.stopAndWait(transactionManager);


add this to import

dheeraj-kholia-cs · 2026-05-26T03:45:07Z

        @Override
        public void handleError(Throwable cause) {
-          throw Throwables.propagate(cause);
+            throw new RuntimeException(cause);


add throwables.propageIfunchecked

dheeraj-kholia-cs · 2026-05-26T03:45:47Z

+      io.cdap.cdap.common.service.Services.stopAndWait((Service) messagingService);
    }
    conf.clear();
  }


add import statement instead of using the fully qualified class name

dheeraj-kholia-cs · 2026-05-26T03:46:23Z

      return UserGroupInformation.getCurrentUser().getShortUserName();
    } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);


add propagateIfUnchecked before RuntimeException

dheeraj-kholia-cs · 2026-05-26T03:46:32Z

        userId = UserGroupInformation.getCurrentUser().getShortUserName();
      } catch (IOException e) {
-        throw Throwables.propagate(e);
+        throw new RuntimeException(e);


same as above

dheeraj-kholia-cs · 2026-05-26T03:49:48Z

+        + "identifier=" + identifier
+        + ", keyId=" + keyId
+        + ", digest=" + Bytes.toStringBinary(digest)
+        + "}";


Can we use toStringHelper method from MoreObjects class?

dheeraj-kholia-cs · 2026-05-26T03:50:31Z

                  <exclude>third-party-licenses/**</exclude>
                  <exclude>.gitpod.yml</exclude>
                  <exclude>.gitpod.Dockerfile</exclude>
+                  <exclude>**/target/**</exclude>


why is it needed?

dheeraj-kholia-cs · 2026-05-26T03:52:26Z


-    Stopwatch watch = new Stopwatch().start();
-    while (!isPresent && watch.elapsedTime(TimeUnit.MILLISECONDS) < timeToWaitMillis) {
+    long startTime = System.currentTimeMillis();


In latest guava version Stopwatch.createStarted() method is available. Can we use that?

dheeraj-kholia-cs · 2026-05-26T03:53:55Z


    ZKClientService zkClient2 = injector2.getInstance(ZKClientService.class);
-    zkClient2.startAndWait();
+    io.cdap.cdap.common.service.Services.startAndWait(zkClient2);


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T03:54:09Z

    // create 2 cache instances
    ZKClientService zkClient1 = injector1.getInstance(ZKClientService.class);
-    zkClient1.startAndWait();
+    io.cdap.cdap.common.service.Services.startAndWait(zkClient1);


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T03:55:18Z

+    io.cdap.cdap.common.service.Services.stopAndWait(dsOpService);
+    io.cdap.cdap.common.service.Services.stopAndWait(transactionManager);
+    io.cdap.cdap.common.service.Services.stopAndWait(metrics);
    conf.clear();


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T03:55:26Z

    httpService.stop();
-    router.stopAndWait();
+    io.cdap.cdap.common.service.Services.stopAndWait(router);
  }


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T03:55:39Z

    @Override
    protected void shutDown() {
-      router.stopAndWait();
+      io.cdap.cdap.common.service.Services.stopAndWait(router);


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T03:55:51Z

    @Override
    protected void shutDown() {
-      router.stopAndWait();
+      io.cdap.cdap.common.service.Services.stopAndWait(router);


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T04:58:10Z

-    router2.stopAndWait();
+    io.cdap.cdap.common.service.Services.stopAndWait(router1);
+    io.cdap.cdap.common.service.Services.stopAndWait(router2);
+


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T04:58:19Z

+      io.cdap.cdap.common.service.Services.stopAndWait(mockService);
    }
  }



add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T04:59:10Z

+        + ", issueTimestamp=" + issueTimestamp
+        + ", expireTimestamp=" + expireTimestamp
+        + "}";
  }


try to use Moreobjects method

dheeraj-kholia-cs · 2026-05-26T04:59:23Z

        return accessController;
      } catch (Exception e) {
-        throw Throwables.propagate(e);
+        throw new RuntimeException(e);


also add Throwables.propagateIfUnchecked

dheeraj-kholia-cs · 2026-05-26T04:59:46Z

+        accessControllerClassLoader.close();
+
+      } catch (Exception ignored) {
+


nir: remove empty lines and add code comment in empty catch block

dheeraj-kholia-cs · 2026-05-26T05:00:09Z

+      throw new RuntimeException(e);
    }
  }



also add Throwables.propagateIfUnchecked

dheeraj-kholia-cs · 2026-05-26T05:00:19Z

-      throw Throwables.propagate(wrappedException);
+      throw new RuntimeException(wrappedException);
    }
  }


same as above

dheeraj-kholia-cs · 2026-05-26T05:01:04Z

  public void destroy() {
-    tokenManager.stop();
+    io.cdap.cdap.common.service.Services.stopAndWait(tokenManager);
  }


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T05:01:55Z

        String useLdaps = handlerProps.get("useLdaps");
-        if (Boolean.parseBoolean(Objects.firstNonNull(useLdaps, "false"))) {
+        if (Boolean.parseBoolean(useLdaps != null ? useLdaps : "false")) {
          ldapSSLVerifyCertificate = Boolean.parseBoolean(


can we use MoreObjects.firstNonNull ?

dheeraj-kholia-cs · 2026-05-26T05:02:25Z

+
+                throw (Error) t;
+
+              }


nit: remove empty lines

dheeraj-kholia-cs · 2026-05-26T05:02:43Z

    } catch (ExecutionException ee) {
      // recheck if already created
-      throw Throwables.propagate(ee.getCause());
+      throw new RuntimeException(ee.getCause());


also add Throwables.propagateIfUnchecked

dheeraj-kholia-cs · 2026-05-26T05:03:01Z

+    io.cdap.cdap.common.service.Services.startAndWait(keyManager);
    if (expectLeader) {
      Tasks.waitFor(true, () -> keyManager.getCurrentKey() != null, 5L, TimeUnit.SECONDS);
    }


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T05:03:07Z

-      keyManager.stopAndWait();
+      io.cdap.cdap.common.service.Services.stopAndWait(keyManager);
    }
  }


add fully qualified class name in import

dheeraj-kholia-cs · 2026-05-26T05:03:43Z

+    io.cdap.cdap.common.service.Services.stopAndWait(server);
    // Clear any security properties for zookeeper.
    System.clearProperty(Constants.External.Zookeeper.ENV_AUTH_PROVIDER_1);
    Configuration.setConfiguration(null);


add fully qualified class name in import

AbhishekKumar9984 added 2 commits May 5, 2026 09:47

fix the router pod

390098b

fixes haddop fixes

fc973cc

dheeraj-kholia-cs reviewed May 26, 2026

View reviewed changes

		accessControllerClassLoader.close();

		} catch (Exception ignored) {

Conversation

AbhishekKumar9984 commented May 5, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dheeraj-kholia-cs May 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

dheeraj-kholia-cs May 26, 2026 •

edited

Loading