[controller] CI build fix (linkedin#997)

LiveIntent · May 21, 2024 · 0a64bf4 · 0a64bf4
1 parent d0f931b
commit 0a64bf4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...enice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java b/...enice-controller/src/main/java/com/linkedin/venice/controller/VeniceParentHelixAdmin.java
@@ -1157,7 +1157,8 @@ Optional<String> getTopicForCurrentPushJob(
       final String latestTopicName = latestTopic.get().getName();
       int versionNumber = Version.parseVersionFromKafkaTopicName(latestTopicName);
       Store store = getStore(clusterName, storeName);
-      if (store.getVersion(versionNumber).map(Version::isVersionSwapDeferred).orElse(false)) {
+      Version version = store.getVersion(versionNumber);
+      if (version != null && version.isVersionSwapDeferred()) {
         LOGGER.error(
             "There is already future version {} exists for store {}, please wait till the future version is made current.",
             versionNumber,
@@ -3545,7 +3546,8 @@ private OfflinePushStatusInfo getOffLineJobStatus(
       try (AutoCloseableLock ignore = resources.getClusterLockManager().createStoreWriteLock(storeName)) {
         ReadWriteStoreRepository repository = resources.getStoreMetadataRepository();
         Store parentStore = repository.getStore(storeName);
-        boolean isDeferredSwap = parentStore.getVersion(versionNum).map(Version::isVersionSwapDeferred).orElse(false);
+        Version version = parentStore.getVersion(versionNum);
+        boolean isDeferredSwap = version != null && version.isVersionSwapDeferred();
         if (!isDeferredSwap) {
           // targetedRegions is non-empty for target region push of batch store
           boolean isTargetRegionPush = !StringUtils.isEmpty(targetedRegions);