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 ae...@apache.org on 2017/09/07 21:36:50 UTC
[37/37] hadoop git commit: Merge branch 'trunk' into HDFS-7240
Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e319be93
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e319be93
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e319be93
Branch: refs/heads/HDFS-7240
Commit: e319be93b9d1aeef76efd6c8e9cc2b8efc3502dc
Parents: 5cd6d7b a4cd101
Author: Anu Engineer <ae...@apache.org>
Authored: Thu Sep 7 14:35:56 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Thu Sep 7 14:35:56 2017 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/conf/Configuration.java | 116 +-
.../org/apache/hadoop/conf/CorePropertyTag.java | 37 +
.../org/apache/hadoop/conf/HDFSPropertyTag.java | 41 +
.../org/apache/hadoop/conf/PropertyTag.java | 30 +
.../org/apache/hadoop/conf/YarnPropertyTag.java | 39 +
.../java/org/apache/hadoop/util/StopWatch.java | 17 +-
.../apache/hadoop/conf/TestConfiguration.java | 112 +-
.../hdfs/protocol/AddECPolicyResponse.java | 4 +-
.../hdfs/protocol/IllegalECPolicyException.java | 34 -
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 5 +-
.../namenode/ErasureCodingPolicyManager.java | 39 +-
.../server/namenode/FSDirErasureCodingOp.java | 3 +-
.../hdfs/server/namenode/FSDirectory.java | 58 +-
.../hdfs/server/namenode/FSNamesystem.java | 3 +-
.../src/main/resources/hdfs-default.xml | 14 +-
.../hadoop/hdfs/TestDistributedFileSystem.java | 4 +-
.../namenode/TestINodeAttributeProvider.java | 105 +-
.../apache/hadoop/fs/s3a/S3AInputStream.java | 2 +-
.../fs/azure/AzureNativeFileSystemStore.java | 73 +-
.../hadoop/fs/azure/BlockBlobAppendStream.java | 1301 +++++++++++-------
.../hadoop/fs/azure/NativeAzureFileSystem.java | 77 +-
.../hadoop/fs/azure/NativeFileSystemStore.java | 5 +-
.../fs/azure/SecureStorageInterfaceImpl.java | 10 +-
.../hadoop/fs/azure/SelfRenewingLease.java | 10 +-
.../hadoop/fs/azure/StorageInterface.java | 3 +-
.../hadoop/fs/azure/StorageInterfaceImpl.java | 12 +-
.../fs/azure/SyncableDataOutputStream.java | 11 +
.../hadoop-azure/src/site/markdown/index.md | 34 +
.../hadoop/fs/azure/MockStorageInterface.java | 3 +-
.../azure/TestAzureConcurrentOutOfBandIo.java | 6 +-
...estNativeAzureFileSystemBlockCompaction.java | 266 ++++
.../src/test/resources/log4j.properties | 1 +
.../distributedshell/ApplicationMaster.java | 19 +-
.../apache/hadoop/yarn/client/api/NMClient.java | 18 +
.../yarn/client/api/async/NMClientAsync.java | 36 +
.../api/async/impl/NMClientAsyncImpl.java | 92 +-
.../yarn/client/api/impl/NMClientImpl.java | 29 +
.../api/async/impl/TestNMClientAsync.java | 60 +-
.../yarn/client/api/impl/TestAMRMClient.java | 1 +
.../api/impl/TestAMRMClientOnRMRestart.java | 4 +-
.../yarn/client/api/impl/TestNMClient.java | 5 +-
.../hadoop/yarn/client/cli/TestLogsCLI.java | 16 +-
.../logaggregation/AggregatedLogFormat.java | 105 +-
.../logaggregation/LogAggregationUtils.java | 32 +-
.../yarn/logaggregation/LogCLIHelpers.java | 41 +-
.../LogAggregationFileController.java | 21 +-
.../tfile/LogAggregationTFileController.java | 1 -
.../hadoop/yarn/server/webapp/AppBlock.java | 9 +-
.../RLESparseResourceAllocation.java | 5 +-
49 files changed, 2215 insertions(+), 754 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e319be93/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e319be93/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java
----------------------------------------------------------------------
diff --cc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java
index 100d38c,3062f3d..57e8104
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/RLESparseResourceAllocation.java
@@@ -409,7 -408,7 +408,7 @@@ public class RLESparseResourceAllocatio
// test for negative value and throws
if (operator == RLEOperator.subtractTestNonNegative
&& (Resources.fitsIn(val, ZERO_RESOURCE)
-- && !Resources.equals(val, ZERO_RESOURCE))) {
++ && !Resources.equals(val, ZERO_RESOURCE))) {
throw new PlanningException(
"RLESparseResourceAllocation: merge failed as the "
+ "resulting RLESparseResourceAllocation would be negative");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org