chenboat commented on a change in pull request #5700:
URL: https://github.com/apache/incubator-pinot/pull/5700#discussion_r458391255
##########
File path:
pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/LLRealtimeSegmentDataManager.java
##########
@@ -846,16 +846,22 @@ protected boolean commitSegment(String controllerVipUrl,
boolean isSplitCommit)
if (isSplitCommit) {
// TODO: make segment uploader used in the segment committer
configurable.
SegmentUploader segmentUploader;
- try {
- segmentUploader =
- new Server2ControllerSegmentUploader(segmentLogger,
_protocolHandler.getFileUploadDownloadClient(),
- _protocolHandler.getSegmentCommitUploadURL(params,
controllerVipUrl), _segmentNameStr,
-
ServerSegmentCompletionProtocolHandler.getSegmentUploadRequestTimeoutMs(),
_serverMetrics);
- } catch (URISyntaxException e) {
- segmentLogger.error("Segment commit upload url error: ", e);
- return SegmentCompletionProtocol.RESP_NOT_SENT;
+ if
(this._tableConfig.getValidationConfig().getPeerSegmentDownloadScheme() !=
null) {
Review comment:
Done. thanks for the suggestion.. Much cleaner codes now.
##########
File path:
pinot-core/src/main/java/org/apache/pinot/core/data/manager/realtime/PeerSchemeSplitSegmentCommitter.java
##########
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pinot.core.data.manager.realtime;
+
+import java.io.File;
+import java.net.URI;
+import org.apache.pinot.common.protocols.SegmentCompletionProtocol;
+import org.apache.pinot.common.utils.LLCSegmentName;
+import org.apache.pinot.server.realtime.ServerSegmentCompletionProtocolHandler;
+import org.slf4j.Logger;
+
+
+public class PeerSchemeSplitSegmentCommitter extends SplitSegmentCommitter {
+ public PeerSchemeSplitSegmentCommitter(Logger segmentLogger,
ServerSegmentCompletionProtocolHandler protocolHandler,
+ SegmentCompletionProtocol.Request.Params params, SegmentUploader
segmentUploader) {
+ super(segmentLogger, protocolHandler, params, segmentUploader);
+ }
+
+ // Always return true even if the segment upload fails and return null uri.
+ // If the segment upload fails, put peer:///segment_name in the segment
location to notify the controller it is a
+ // peer download scheme.
+ protected boolean uploadSegment(File segmentTarFile, SegmentUploader
segmentUploader,
+ SegmentCompletionProtocol.Request.Params params) {
+ URI segmentLocation = segmentUploader.uploadSegment(segmentTarFile, new
LLCSegmentName(params.getSegmentName()));
+ if (segmentLocation != null) {
+ params.withSegmentLocation(segmentLocation.toString());
+ } else {
+ params.withSegmentLocation("peer:///" + params.getSegmentName());
Review comment:
Done.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
