(hadoop) branch trunk updated: HDFS-17259. Fix typo in TestFsDatasetImpl Class. (#6278). Contributed by huangzhaobo99.

2023-11-30 Thread ayushsaxena
This is an automated email from the ASF dual-hosted git repository.

ayushsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 89e78a76a0c3 HDFS-17259. Fix typo in TestFsDatasetImpl Class. (#6278). 
Contributed by huangzhaobo99.
89e78a76a0c3 is described below

commit 89e78a76a0c3d50b5dd46350392bfeef638b72d4
Author: huangzhaobo 
AuthorDate: Fri Dec 1 13:16:31 2023 +0800

HDFS-17259. Fix typo in TestFsDatasetImpl Class. (#6278). Contributed by 
huangzhaobo99.
---
 .../hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
index d49198b53dd5..2f068a6a69c6 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
@@ -1713,9 +1713,9 @@ public class TestFsDatasetImpl {
   @Test
   public void testNotifyNamenodeMissingOrNewBlock() throws Exception {
 long blockSize = 1024;
-int heatbeatInterval = 1;
+int heartbeatInterval = 1;
 HdfsConfiguration c = new HdfsConfiguration();
-c.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, heatbeatInterval);
+c.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, heartbeatInterval);
 c.setLong(DFS_BLOCK_SIZE_KEY, blockSize);
 MiniDFSCluster cluster = new MiniDFSCluster.Builder(c).
 numDataNodes(1).build();
@@ -1964,9 +1964,9 @@ public class TestFsDatasetImpl {
   @Test
   public void tesInvalidateMissingBlock() throws Exception {
 long blockSize = 1024;
-int heatbeatInterval = 1;
+int heartbeatInterval = 1;
 HdfsConfiguration c = new HdfsConfiguration();
-c.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, heatbeatInterval);
+c.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, heartbeatInterval);
 c.setLong(DFS_BLOCK_SIZE_KEY, blockSize);
 MiniDFSCluster cluster = new MiniDFSCluster.Builder(c).
 numDataNodes(1).build();


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



(hadoop) branch trunk updated: HADOOP-18924. Upgrade to grpc 1.53.0 due to CVEs (#6161). Contributed by PJ Fanning.

2023-11-30 Thread ayushsaxena
This is an automated email from the ASF dual-hosted git repository.

ayushsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 3cb3dfafe508 HADOOP-18924. Upgrade to grpc 1.53.0 due to CVEs (#6161). 
Contributed by PJ Fanning.
3cb3dfafe508 is described below

commit 3cb3dfafe508d3c505851749852578dece2d6525
Author: PJ Fanning 
AuthorDate: Fri Dec 1 05:23:47 2023 +0100

HADOOP-18924. Upgrade to grpc 1.53.0 due to CVEs (#6161). Contributed by PJ 
Fanning.

Signed-off-by: Ayush Saxena 
---
 LICENSE-binary  | 16 
 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml | 16 ++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 90afc172e2d7..1742e787a66b 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -250,13 +250,13 @@ commons-daemon:commons-daemon:1.0.13
 commons-io:commons-io:2.14.0
 commons-net:commons-net:3.9.0
 de.ruedigermoeller:fst:2.50
-io.grpc:grpc-api:1.26.0
-io.grpc:grpc-context:1.26.0
-io.grpc:grpc-core:1.26.0
-io.grpc:grpc-netty:1.26.0
-io.grpc:grpc-protobuf:1.26.0
-io.grpc:grpc-protobuf-lite:1.26.0
-io.grpc:grpc-stub:1.26.0
+io.grpc:grpc-api:1.53.0
+io.grpc:grpc-context:1.53.0
+io.grpc:grpc-core:1.53.0
+io.grpc:grpc-netty:1.53.0
+io.grpc:grpc-protobuf:1.53.0
+io.grpc:grpc-protobuf-lite:1.53.0
+io.grpc:grpc-stub:1.53.0
 io.netty:netty-all:4.1.100.Final
 io.netty:netty-buffer:4.1.100.Final
 io.netty:netty-codec:4.1.100.Final
@@ -482,7 +482,7 @@ com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
 org.bouncycastle:bcpkix-jdk15on:1.68
 org.bouncycastle:bcprov-jdk15on:1.68
 org.checkerframework:checker-qual:2.5.2
-org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.codehaus.mojo:animal-sniffer-annotations:1.21
 org.jruby.jcodings:jcodings:1.0.13
 org.jruby.joni:joni:2.1.2
 org.slf4j:jul-to-slf4j:jar:1.7.25
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
index 864067ce9746..38bc9085abf2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml
@@ -26,7 +26,8 @@
 jar
 
 
-1.26.0
+1.53.0
+1.21
 
 
 
@@ -48,6 +49,17 @@
 io.grpc
 grpc-core
 ${grpc.version}
+
+
+org.codehaus.mojo
+animal-sniffer-annotations
+
+
+
+
+org.codehaus.mojo
+animal-sniffer-annotations
+${animal-sniffer.version}
 
 
 io.grpc
@@ -197,7 +209,7 @@
 
 
com.google.protobuf:protoc:${hadoop.protobuf.version}:exe:${os.detected.classifier}
 grpc-java
-
io.grpc:protoc-gen-grpc-java:1.26.0:exe:${os.detected.classifier}
+
io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
 
 
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



(hadoop) branch trunk updated (5cda162a804f -> 0417c1c633da)

2023-11-30 Thread slfan1989
This is an automated email from the ASF dual-hosted git repository.

slfan1989 pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


from 5cda162a804f HADOOP-18915. Tune/extend S3A http connection and thread 
pool settings (#6180)
 add 0417c1c633da HDFS-17263. RBF: Fix client ls trash path cannot get 
except default nameservices trash path (#6291) Contributed by liuguanghua.

No new revisions were added by this update.

Summary of changes:
 .../federation/resolver/MountTableResolver.java|  2 +-
 .../federation/router/RouterClientProtocol.java|  2 +-
 .../server/federation/router/TestRouterTrash.java  | 60 ++
 3 files changed, 62 insertions(+), 2 deletions(-)


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org