Include datasource name in the failure messages.
When a segment publish error occurs, it's hard to tell which supervisor to
reset if there are multiple supervisors consuming from the same stream. This
change includes the datasource name to the error messages. Ideally we would also include
the supervisor ID in the error, but since the supervisor ID is currently the same as
the datasource name, this should suffice for now.
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 095e9c3..858c3ed 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
@@ -151,7 +151,8 @@
Assert.assertEquals(
SegmentPublishResult.retryableFailure(
"The new start metadata state[ObjectMetadata{theObject=[1]}] is"
- + " ahead of the last committed end state[null]. Try resetting the supervisor."
+ + " ahead of the last committed end state[null]. Try resetting the supervisor for datasource[%s].",
+ DATA_SOURCE
),
result
);
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 722b3a8..2bf69f7 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -2200,16 +2200,16 @@
// the previous task finishes publishing.
return SegmentPublishResult.retryableFailure(
"The new start metadata state[%s] is ahead of the last committed"
- + " end state[%s]. Try resetting the supervisor.",
- startMetadata, oldCommitMetadataFromDb
+ + " end state[%s]. Try resetting the supervisor for datasource[%s].",
+ startMetadata, oldCommitMetadataFromDb, dataSource
);
}
if (!startMetadataMatchesExisting) {
// Not in the desired start state.
return SegmentPublishResult.fail(
- "Inconsistency between stored metadata state[%s] and target state[%s]. Try resetting the supervisor.",
- oldCommitMetadataFromDb, startMetadata
+ "Inconsistency between stored metadata state[%s] and target state[%s]. Try resetting the supervisor for datasource[%s].",
+ oldCommitMetadataFromDb, startMetadata, dataSource
);
}
diff --git a/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
index db5c23b..bb3b7c3 100644
--- a/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
+++ b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
@@ -886,7 +886,7 @@
Assert.assertEquals(
SegmentPublishResult.retryableFailure(
"The new start metadata state[ObjectMetadata{theObject={foo=bar}}] is ahead of the last committed"
- + " end state[null]. Try resetting the supervisor."
+ + " end state[null]. Try resetting the supervisor for datasource[fooDataSource]."
),
result1
);
@@ -915,7 +915,7 @@
Assert.assertEquals(
SegmentPublishResult.fail(
"Inconsistency between stored metadata state[ObjectMetadata{theObject={foo=baz}}]"
- + " and target state[ObjectMetadata{theObject=null}]. Try resetting the supervisor."
+ + " and target state[ObjectMetadata{theObject=null}]. Try resetting the supervisor for datasource[fooDataSource]."
),
result2
);
@@ -1058,7 +1058,7 @@
Assert.assertEquals(
SegmentPublishResult.fail(
"Inconsistency between stored metadata state[ObjectMetadata{theObject={foo=baz}}] and "
- + "target state[ObjectMetadata{theObject={foo=qux}}]. Try resetting the supervisor."
+ + "target state[ObjectMetadata{theObject={foo=qux}}]. Try resetting the supervisor for datasource[fooDataSource]."
),
result2
);
