Jackie-Jiang commented on a change in pull request #7289:
URL: https://github.com/apache/pinot/pull/7289#discussion_r688191720
##########
File path:
pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java
##########
@@ -223,6 +224,24 @@ private void processNewSegment(SegmentMetadata
segmentMetadata, URI finalSegment
zkDownloadURI);
}
_pinotHelixResourceManager.addNewSegment(tableNameWithType,
segmentMetadata, zkDownloadURI, crypter);
+
+ // Update zk metadata customer map for offline table
+ String segmentZKMetadataCustomMapModifierStr = headers != null ? headers
+
.getHeaderString(FileUploadDownloadClient.CustomHeaders.SEGMENT_ZK_METADATA_CUSTOM_MAP_MODIFIER)
: null;
+ if (segmentZKMetadataCustomMapModifierStr != null) {
+ ZNRecord segmentMetadataZnRecord =
+
_pinotHelixResourceManager.getSegmentMetadataZnRecord(tableNameWithType,
segmentName);
+ SegmentZKMetadata segmentZKMetadata = new
SegmentZKMetadata(segmentMetadataZnRecord);
+
+ SegmentZKMetadataCustomMapModifier segmentZKMetadataCustomMapModifier;
+ segmentZKMetadataCustomMapModifier =
+ new
SegmentZKMetadataCustomMapModifier(segmentZKMetadataCustomMapModifierStr);
+
segmentZKMetadata.setCustomMap(segmentZKMetadataCustomMapModifier.modifyMap(null));
+ if (!_pinotHelixResourceManager.updateZkMetadata(tableNameWithType,
segmentZKMetadata)) {
Review comment:
Set the expected version
##########
File path:
pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java
##########
@@ -223,6 +224,24 @@ private void processNewSegment(SegmentMetadata
segmentMetadata, URI finalSegment
zkDownloadURI);
}
_pinotHelixResourceManager.addNewSegment(tableNameWithType,
segmentMetadata, zkDownloadURI, crypter);
+
+ // Update zk metadata customer map for offline table
+ String segmentZKMetadataCustomMapModifierStr = headers != null ? headers
+
.getHeaderString(FileUploadDownloadClient.CustomHeaders.SEGMENT_ZK_METADATA_CUSTOM_MAP_MODIFIER)
: null;
+ if (segmentZKMetadataCustomMapModifierStr != null) {
+ ZNRecord segmentMetadataZnRecord =
+
_pinotHelixResourceManager.getSegmentMetadataZnRecord(tableNameWithType,
segmentName);
+ SegmentZKMetadata segmentZKMetadata = new
SegmentZKMetadata(segmentMetadataZnRecord);
+
+ SegmentZKMetadataCustomMapModifier segmentZKMetadataCustomMapModifier;
+ segmentZKMetadataCustomMapModifier =
+ new
SegmentZKMetadataCustomMapModifier(segmentZKMetadataCustomMapModifierStr);
+
segmentZKMetadata.setCustomMap(segmentZKMetadataCustomMapModifier.modifyMap(null));
Review comment:
(Critical)
```suggestion
segmentZKMetadata.setCustomMap(segmentZKMetadataCustomMapModifier.modifyMap(segmentZKMetadata.getCustomMap()));
```
##########
File path:
pinot-controller/src/main/java/org/apache/pinot/controller/api/upload/ZKOperator.java
##########
@@ -223,6 +224,24 @@ private void processNewSegment(SegmentMetadata
segmentMetadata, URI finalSegment
zkDownloadURI);
}
_pinotHelixResourceManager.addNewSegment(tableNameWithType,
segmentMetadata, zkDownloadURI, crypter);
+
+ // Update zk metadata customer map for offline table
+ String segmentZKMetadataCustomMapModifierStr = headers != null ? headers
+
.getHeaderString(FileUploadDownloadClient.CustomHeaders.SEGMENT_ZK_METADATA_CUSTOM_MAP_MODIFIER)
: null;
+ if (segmentZKMetadataCustomMapModifierStr != null) {
+ ZNRecord segmentMetadataZnRecord =
+
_pinotHelixResourceManager.getSegmentMetadataZnRecord(tableNameWithType,
segmentName);
+ SegmentZKMetadata segmentZKMetadata = new
SegmentZKMetadata(segmentMetadataZnRecord);
+
+ SegmentZKMetadataCustomMapModifier segmentZKMetadataCustomMapModifier;
+ segmentZKMetadataCustomMapModifier =
+ new
SegmentZKMetadataCustomMapModifier(segmentZKMetadataCustomMapModifierStr);
Review comment:
(nit)
```suggestion
SegmentZKMetadataCustomMapModifier segmentZKMetadataCustomMapModifier =
new
SegmentZKMetadataCustomMapModifier(segmentZKMetadataCustomMapModifierStr);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
