[druid] branch master updated: fix ci (#13901)

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

abhishek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new 68db39d08a fix ci (#13901)
68db39d08a is described below

commit 68db39d08adbdadc095ec5cd8cdc54a93f007b00
Author: Clint Wylie <cw...@apache.org>
AuthorDate: Wed Mar 8 03:25:47 2023 -0800

    fix ci (#13901)
    
    This PR is #13899 plus spotbugs fix to fix the failures introduced by #13815
---
 .github/workflows/codeql.yml                            |  2 +-
 .../actions/SegmentTransactionalInsertActionTest.java   | 17 +++++++++++++++--
 .../metadata/IndexerSQLMetadataStorageCoordinator.java  |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 72f2079e62..4e13d31de0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -45,7 +45,7 @@ jobs:
 
     - run: |
         echo "Building using custom commands"
-        mvn clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Dweb.console.skip=true
+        mvn clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Dweb.console.skip=true -Dcyclonedx.skip=true
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java
index 5f50e4abf5..0243a0d20d 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java
@@ -183,7 +183,14 @@ public class SegmentTransactionalInsertActionTest
         actionTestKit.getTaskActionToolbox()
     );
 
-    Assert.assertEquals(SegmentPublishResult.fail("java.lang.RuntimeException: Aborting transaction!"), result);
+    Assert.assertEquals(
+        SegmentPublishResult.fail(
+          "java.lang.RuntimeException: Inconsistent metadata state. " +
+          "This can happen if you update input topic in a spec without changing the supervisor name. " +
+          "Stored state: [null], Target state: [ObjectMetadata{theObject=[1]}]."
+        ),
+        result
+    );
   }
 
   @Test
@@ -203,7 +210,13 @@ public class SegmentTransactionalInsertActionTest
         actionTestKit.getTaskActionToolbox()
     );
 
-    Assert.assertEquals(SegmentPublishResult.fail("org.apache.druid.metadata.RetryTransactionException: Aborting transaction!"), result);
+    Assert.assertEquals(
+        SegmentPublishResult.fail(
+            "org.apache.druid.metadata.RetryTransactionException: " +
+            "Failed to drop some segments. Only 0 could be dropped out of 1. Trying again"
+        ),
+        result
+    );
   }
 
   @Test
diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
index 4286fe74c0..307bfb0508 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -1922,7 +1922,7 @@ public class IndexerSQLMetadataStorageCoordinator implements IndexerMetadataStor
     private final boolean canRetry;
     @Nullable private final String errorMsg;
 
-    public static DataStoreMetadataUpdateResult SUCCESS = new DataStoreMetadataUpdateResult(false, false, null);
+    public static final DataStoreMetadataUpdateResult SUCCESS = new DataStoreMetadataUpdateResult(false, false, null);
 
     DataStoreMetadataUpdateResult(boolean failed, boolean canRetry, @Nullable String errorMsg, Object... errorFormatArgs)
     {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org