You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2018/08/24 01:01:03 UTC
hadoop git commit: HDFS-13851. Remove AlignmentContext from
AbstractNNFailoverProxyProvider. Contributed by Konstantin Shvachko.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-12943 5eeba62ed -> 90e61bf0f
HDFS-13851. Remove AlignmentContext from AbstractNNFailoverProxyProvider. Contributed by Konstantin Shvachko.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/90e61bf0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/90e61bf0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/90e61bf0
Branch: refs/heads/HDFS-12943
Commit: 90e61bf0f2f65934d2bf20358f7f0deda4798c5e
Parents: 5eeba62
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Thu Aug 23 18:00:19 2018 -0700
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Thu Aug 23 18:00:19 2018 -0700
----------------------------------------------------------------------
.../server/namenode/ha/AbstractNNFailoverProxyProvider.java | 5 -----
.../hdfs/server/namenode/ha/ObserverReadProxyProvider.java | 1 -
.../org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java | 5 -----
3 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90e61bf0/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java
index af94865..e0fdb32 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/AbstractNNFailoverProxyProvider.java
@@ -21,7 +21,6 @@ package org.apache.hadoop.hdfs.server.namenode.ha;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.io.retry.FailoverProxyProvider;
-import org.apache.hadoop.ipc.AlignmentContext;
public abstract class AbstractNNFailoverProxyProvider<T> implements
FailoverProxyProvider <T> {
@@ -52,8 +51,4 @@ public abstract class AbstractNNFailoverProxyProvider<T> implements
public synchronized AtomicBoolean getFallbackToSimpleAuth() {
return fallbackToSimpleAuth;
}
-
- public synchronized AlignmentContext getAlignmentContext() {
- return null; // by default the context is null
- }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90e61bf0/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
index 25035ab..754fea4 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/ObserverReadProxyProvider.java
@@ -113,7 +113,6 @@ public class ObserverReadProxyProvider<T extends ClientProtocol>
}
}
- @Override
public synchronized AlignmentContext getAlignmentContext() {
return alignmentContext;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/90e61bf0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java
index ae82881..1acbd75 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestStateAlignmentContextWithHA.java
@@ -94,11 +94,6 @@ public class TestStateAlignmentContextWithHA {
AC_LIST.add(alignmentContext);
}
-
- @Override // AbstractNNFailoverProxyProvider
- public synchronized ClientGSIContext getAlignmentContext() {
- return this.alignmentContext;
- }
}
static class SpyConfiguredContextProxyProvider<T>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org