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 tm...@apache.org on 2018/09/06 01:51:04 UTC

hadoop git commit: Fixing findbugs and license issues related to:

Repository: hadoop
Updated Branches:
  refs/heads/HADOOP-15407 8bd9c55c5 -> e5d50c734


Fixing findbugs and license issues related to:

HADOOP-15703. ABFS - Implement client-side throttling.
Contributed by Sneha Varma and Thomas Marquardt.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e5d50c73
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e5d50c73
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e5d50c73

Branch: refs/heads/HADOOP-15407
Commit: e5d50c734dd7160daeee789b0fd6ca614319bd1f
Parents: 8bd9c55
Author: Thomas Marquardt <tm...@microsoft.com>
Authored: Thu Sep 6 01:35:49 2018 +0000
Committer: Thomas Marquardt <tm...@microsoft.com>
Committed: Thu Sep 6 01:35:49 2018 +0000

----------------------------------------------------------------------
 .../services/AbfsClientThrottlingIntercept.java   |  4 ++--
 .../TestAbfsClientThrottlingAnalyzer.java         | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5d50c73/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClientThrottlingIntercept.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClientThrottlingIntercept.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClientThrottlingIntercept.java
index e981d76..0892219 100644
--- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClientThrottlingIntercept.java
+++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClientThrottlingIntercept.java
@@ -46,8 +46,6 @@ public final class AbfsClientThrottlingIntercept {
   private AbfsClientThrottlingIntercept() {
     readThrottler = new AbfsClientThrottlingAnalyzer("read");
     writeThrottler = new AbfsClientThrottlingAnalyzer("write");
-    isAutoThrottlingEnabled = true;
-    LOG.debug("Client-side throttling is enabled for the ABFS file system.");
   }
 
   public static synchronized void initializeSingleton(boolean isAutoThrottlingEnabled) {
@@ -56,6 +54,8 @@ public final class AbfsClientThrottlingIntercept {
     }
     if (singleton == null) {
       singleton = new AbfsClientThrottlingIntercept();
+      isAutoThrottlingEnabled = true;
+      LOG.debug("Client-side throttling is enabled for the ABFS file system.");
     }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e5d50c73/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClientThrottlingAnalyzer.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClientThrottlingAnalyzer.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClientThrottlingAnalyzer.java
index 5105b85..3f680e4 100644
--- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClientThrottlingAnalyzer.java
+++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsClientThrottlingAnalyzer.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.hadoop.fs.azurebfs.services;
 
 import org.apache.hadoop.fs.contract.ContractTestUtils;


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