You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by er...@apache.org on 2021/10/25 17:37:28 UTC

[ozone] branch ozone-1.2 updated (417b8e1 -> fb9513f)

This is an automated email from the ASF dual-hosted git repository.

erose pushed a change to branch ozone-1.2
in repository https://gitbox.apache.org/repos/asf/ozone.git.


    from 417b8e1  HDDS-5756 Bump the no. of cached RocksDBs handles (#2712)
     new 4bd3338  HDDS-5812. Increase Ratis version to 2.2.0 (#2753)
     new fb9513f  HDDS-5875. Do not cache tokens as part of Key Information. (#2754)

The 2 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.


Summary of changes:
 .../hadoop/ozone/om/request/key/OMKeyCommitRequest.java       | 11 ++++++++++-
 pom.xml                                                       |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org


[ozone] 02/02: HDDS-5875. Do not cache tokens as part of Key Information. (#2754)

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

erose pushed a commit to branch ozone-1.2
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit fb9513fd7296f075f77288026ca558b1b9d1f1f8
Author: Bharat Viswanadham <bh...@apache.org>
AuthorDate: Fri Oct 22 09:46:58 2021 -0700

    HDDS-5875. Do not cache tokens as part of Key Information. (#2754)
---
 .../hadoop/ozone/om/request/key/OMKeyCommitRequest.java       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
index ff53faa..fe69e69 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
@@ -148,7 +148,16 @@ public class OMKeyCommitRequest extends OMKeyRequest {
 
       List<OmKeyLocationInfo> locationInfoList = new ArrayList<>();
       for (KeyLocation keyLocation : commitKeyArgs.getKeyLocationsList()) {
-        locationInfoList.add(OmKeyLocationInfo.getFromProtobuf(keyLocation));
+        OmKeyLocationInfo locationInfo =
+            OmKeyLocationInfo.getFromProtobuf(keyLocation);
+
+        // Strip out tokens before adding to cache.
+        // This way during listStatus token information does not pass on to
+        // client when returning from cache.
+        if (ozoneManager.isGrpcBlockTokenEnabled()) {
+          locationInfo.setToken(null);
+        }
+        locationInfoList.add(locationInfo);
       }
 
       bucketLockAcquired =

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org


[ozone] 01/02: HDDS-5812. Increase Ratis version to 2.2.0 (#2753)

Posted by er...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

erose pushed a commit to branch ozone-1.2
in repository https://gitbox.apache.org/repos/asf/ozone.git

commit 4bd333883dc85390bdb5d914d60159bbf3d7a194
Author: Ethan Rose <33...@users.noreply.github.com>
AuthorDate: Wed Oct 20 16:33:02 2021 -0700

    HDDS-5812. Increase Ratis version to 2.2.0 (#2753)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a2c24f1..e8b7f07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <declared.ozone.version>${ozone.version}</declared.ozone.version>
 
     <!-- Apache Ratis version -->
-    <ratis.version>2.1.0-03f3b68-SNAPSHOT</ratis.version>
+    <ratis.version>2.2.0</ratis.version>
 
     <!-- Apache Ratis thirdparty version -->
     <ratis.thirdparty.version>0.7.0</ratis.thirdparty.version>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org