This PR is #13899 plus spotbugs fix to fix the failures introduced by #13815
This commit is contained in:
Clint Wylie 2023-03-08 03:25:47 -08:00 committed by GitHub
parent 52bd9e6adb
commit 68db39d08a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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)
{