You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by je...@apache.org on 2019/11/25 18:40:24 UTC
[incubator-pinot] branch crypt created (now 7901df7)
This is an automated email from the ASF dual-hosted git repository.
jenniferdai pushed a change to branch crypt
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
at 7901df7 Fixing encryption for .tar.gz upload
This branch includes the following new commits:
new 7901df7 Fixing encryption for .tar.gz upload
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 01/01: Fixing encryption for .tar.gz upload
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jenniferdai pushed a commit to branch crypt
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 7901df7b54264267f6cc6c7e914067b83d4dcfb4
Author: Jennifer Dai <jd...@linkedin.com>
AuthorDate: Mon Nov 25 10:41:45 2019 -0800
Fixing encryption for .tar.gz upload
---
.../api/resources/PinotSegmentUploadDownloadRestletResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java
index 22a7dea..6d36137 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotSegmentUploadDownloadRestletResource.java
@@ -192,7 +192,7 @@ public class PinotSegmentUploadDownloadRestletResource {
metadataProviderClass);
break;
case SEGMENT:
- getFileFromMultipart(multiPart, tempDecryptedFile);
+ getFileFromMultipart(multiPart, tempEncryptedFile);
segmentMetadata = getSegmentMetadata(crypterClassName, tempEncryptedFile, tempDecryptedFile, tempSegmentDir,
metadataProviderClass);
break;
@@ -303,14 +303,14 @@ public class PinotSegmentUploadDownloadRestletResource {
return MetadataExtractorFactory.create(metadataProviderClass).extractMetadata(tempDecryptedFile, tempSegmentDir);
}
- private void completeZkOperations(boolean enableParallelPushProtection, HttpHeaders headers, File tempDecryptedFile,
+ private void completeZkOperations(boolean enableParallelPushProtection, HttpHeaders headers, File tempEncryptedFile,
FileUploadPathProvider provider, String rawTableName, SegmentMetadata segmentMetadata, String segmentName,
String zkDownloadURI, boolean moveSegmentToFinalLocation)
throws Exception {
URI finalSegmentLocationURI =
URIUtils.getUri(provider.getBaseDataDirURI().toString(), rawTableName, URIUtils.encode(segmentName));
ZKOperator zkOperator = new ZKOperator(_pinotHelixResourceManager, _controllerConf, _controllerMetrics);
- zkOperator.completeSegmentOperations(rawTableName, segmentMetadata, finalSegmentLocationURI, tempDecryptedFile,
+ zkOperator.completeSegmentOperations(rawTableName, segmentMetadata, finalSegmentLocationURI, tempEncryptedFile,
enableParallelPushProtection, headers, zkDownloadURI, moveSegmentToFinalLocation);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org