From b7d9a0f827c0688fa1ebe6b71f0e0a4839d73ea2 Mon Sep 17 00:00:00 2001
From: James <jhc@apache.org>
Date: Mon, 24 Oct 2016 10:47:15 -0400
Subject: [PATCH] HDFS-11027: libbhdfs++: Don't retry if there is an
 authentication failure.  Contributed by Xiaowei Zhu.

---
 .../main/native/libhdfspp/include/hdfspp/status.h   |  3 +++
 .../src/main/native/libhdfspp/lib/common/status.cc  | 13 ++++++++++++-
 .../src/main/native/libhdfspp/lib/rpc/rpc_engine.cc |  4 +++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/status.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/status.h
index ffbb2bfe4e0..39cf8c62a99 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/status.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/status.h
@@ -62,6 +62,9 @@ class Status {
   // get error code
   int code() const { return code_; }
 
+  // if retry can possibly recover an error
+  bool notWorthRetry() const;
+
   enum Code {
     kOk = 0,
     kInvalidArgument = static_cast<unsigned>(std::errc::invalid_argument),
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc
index 540f8c17c3f..15d304abd5a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc
@@ -22,6 +22,7 @@
 #include <sstream>
 #include <cstring>
 #include <map>
+#include <set>
 
 namespace hdfs {
 
@@ -49,6 +50,12 @@ const static std::map<std::string, int> kKnownServerExceptionClasses = {
                                             {kPathIsNotEmptyDirectoryException, Status::kPathIsNotEmptyDirectory}
                                         };
 
+// Errors that retry cannot fix. TODO: complete the list.
+const static std::set<int> noRetryExceptions = {
+  Status::kPermissionDenied,
+  Status::kAuthenticationFailed,
+  Status::kAccessControlException
+};
 
 Status::Status(int code, const char *msg1)
                : code_(code) {
@@ -120,7 +127,7 @@ Status Status::Exception(const char *exception_class_name, const char *error_mes
 }
 
 Status Status::Error(const char *error_message) {
-  return Status(kAuthenticationFailed, error_message);
+  return Exception("Exception", error_message);
 }
 
 Status Status::AuthenticationFailed() {
@@ -147,4 +154,8 @@ std::string Status::ToString() const {
   return ss.str();
 }
 
+bool Status::notWorthRetry() const {
+    return noRetryExceptions.find(code_) != noRetryExceptions.end();
+}
+
 }
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.cc
index 72a0c55ca3b..7c280b8d810 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.cc
@@ -322,7 +322,9 @@ void RpcEngine::RpcCommsError(
 
     RetryAction retry = RetryAction::fail(""); // Default to fail
 
-    if (retry_policy()) {
+    if (status.notWorthRetry()) {
+      retry = RetryAction::fail(status.ToString().c_str());
+    } else if (retry_policy()) {
       retry = retry_policy()->ShouldRetry(status, req->IncrementRetryCount(), req->get_failover_count(), true);
     }