[13/50] [abbrv] hadoop git commit: HDFS-7869. Inconsistency in the return information while performing rolling upgrade ( Contributed by J.Andreina )

2015-03-09 Thread jing9 
HDFS-7869. Inconsistency in the return information while performing rolling 
upgrade ( Contributed by J.Andreina )


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

Branch: refs/heads/HDFS-7285
Commit: 871bd4e688b83d63296b604d92d99c781a8977ff
Parents: 7814f50
Author: Vinayakumar B vinayakum...@apache.org
Authored: Wed Mar 4 14:38:38 2015 +0530
Committer: Jing Zhao ji...@apache.org
Committed: Mon Mar 9 13:11:23 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt| 3 +++
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java   | 6 +++---
 .../apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java  | 3 +--
 .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java   | 2 +-
 .../test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java   | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/871bd4e6/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 7ff3c78..2037973 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1083,6 +1083,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7682. {{DistributedFileSystem#getFileChecksum}} of a snapshotted file
 includes non-snapshotted content. (Charles Lamb via atm)
 
+HDFS-7869. Inconsistency in the return information while performing rolling
+upgrade ( J.Andreina via vinayakumarb )
+
 BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
   HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

http://git-wip-us.apache.org/repos/asf/hadoop/blob/871bd4e6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index bd2a203..621ebef 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -7500,7 +7500,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 }
   }
 
-  void finalizeRollingUpgrade() throws IOException {
+  RollingUpgradeInfo finalizeRollingUpgrade() throws IOException {
 checkSuperuserPrivilege();
 checkOperation(OperationCategory.WRITE);
 writeLock();
@@ -7508,7 +7508,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 try {
   checkOperation(OperationCategory.WRITE);
   if (!isRollingUpgrade()) {
-return;
+return null;
   }
   checkNameNodeSafeMode(Failed to finalize rolling upgrade);
 
@@ -7533,7 +7533,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 if (auditLog.isInfoEnabled()  isExternalInvocation()) {
   logAuditEvent(true, finalizeRollingUpgrade, null, null, null);
 }
-return;
+return returnInfo;
   }
 
   RollingUpgradeInfo finalizeRollingUpgradeInternal(long finalizeTime)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/871bd4e6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
index 9ccdb40..f20fb35 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
@@ -1145,8 +1145,7 @@ class NameNodeRpcServer implements NamenodeProtocols {
 case PREPARE:
   return namesystem.startRollingUpgrade();
 case FINALIZE:
-  namesystem.finalizeRollingUpgrade();
-  return null;
+  return namesystem.finalizeRollingUpgrade();
 default:
   throw new UnsupportedActionException(action +  is not yet supported.);
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/871bd4e6/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java

[08/27] hadoop git commit: HDFS-7869. Inconsistency in the return information while performing rolling upgrade ( Contributed by J.Andreina )

2015-03-05 Thread zjshen 
HDFS-7869. Inconsistency in the return information while performing rolling 
upgrade ( Contributed by J.Andreina )


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

Branch: refs/heads/YARN-2928
Commit: 3560180b6e9926aa3ee1357da59b28a4b4689a0d
Parents: 29bb689
Author: Vinayakumar B vinayakum...@apache.org
Authored: Wed Mar 4 14:38:38 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Wed Mar 4 14:38:38 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt| 3 +++
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java   | 6 +++---
 .../apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java  | 3 +--
 .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java   | 2 +-
 .../test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java   | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3560180b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 7ff3c78..2037973 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1083,6 +1083,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7682. {{DistributedFileSystem#getFileChecksum}} of a snapshotted file
 includes non-snapshotted content. (Charles Lamb via atm)
 
+HDFS-7869. Inconsistency in the return information while performing rolling
+upgrade ( J.Andreina via vinayakumarb )
+
 BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
   HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3560180b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index d2b48f3..77b4a27 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -7475,7 +7475,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 }
   }
 
-  void finalizeRollingUpgrade() throws IOException {
+  RollingUpgradeInfo finalizeRollingUpgrade() throws IOException {
 checkSuperuserPrivilege();
 checkOperation(OperationCategory.WRITE);
 writeLock();
@@ -7483,7 +7483,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 try {
   checkOperation(OperationCategory.WRITE);
   if (!isRollingUpgrade()) {
-return;
+return null;
   }
   checkNameNodeSafeMode(Failed to finalize rolling upgrade);
 
@@ -7508,7 +7508,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 if (auditLog.isInfoEnabled()  isExternalInvocation()) {
   logAuditEvent(true, finalizeRollingUpgrade, null, null, null);
 }
-return;
+return returnInfo;
   }
 
   RollingUpgradeInfo finalizeRollingUpgradeInternal(long finalizeTime)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3560180b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
index 9ccdb40..f20fb35 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
@@ -1145,8 +1145,7 @@ class NameNodeRpcServer implements NamenodeProtocols {
 case PREPARE:
   return namesystem.startRollingUpgrade();
 case FINALIZE:
-  namesystem.finalizeRollingUpgrade();
-  return null;
+  return namesystem.finalizeRollingUpgrade();
 default:
   throw new UnsupportedActionException(action +  is not yet supported.);
 }

hadoop git commit: HDFS-7869. Inconsistency in the return information while performing rolling upgrade ( Contributed by J.Andreina )

2015-03-04 Thread vinayakumarb 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 29bb68986 - 3560180b6


HDFS-7869. Inconsistency in the return information while performing rolling 
upgrade ( Contributed by J.Andreina )


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

Branch: refs/heads/trunk
Commit: 3560180b6e9926aa3ee1357da59b28a4b4689a0d
Parents: 29bb689
Author: Vinayakumar B vinayakum...@apache.org
Authored: Wed Mar 4 14:38:38 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Wed Mar 4 14:38:38 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt| 3 +++
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java   | 6 +++---
 .../apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java  | 3 +--
 .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java   | 2 +-
 .../test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java   | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3560180b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 7ff3c78..2037973 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1083,6 +1083,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7682. {{DistributedFileSystem#getFileChecksum}} of a snapshotted file
 includes non-snapshotted content. (Charles Lamb via atm)
 
+HDFS-7869. Inconsistency in the return information while performing rolling
+upgrade ( J.Andreina via vinayakumarb )
+
 BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
   HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3560180b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index d2b48f3..77b4a27 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -7475,7 +7475,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 }
   }
 
-  void finalizeRollingUpgrade() throws IOException {
+  RollingUpgradeInfo finalizeRollingUpgrade() throws IOException {
 checkSuperuserPrivilege();
 checkOperation(OperationCategory.WRITE);
 writeLock();
@@ -7483,7 +7483,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 try {
   checkOperation(OperationCategory.WRITE);
   if (!isRollingUpgrade()) {
-return;
+return null;
   }
   checkNameNodeSafeMode(Failed to finalize rolling upgrade);
 
@@ -7508,7 +7508,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 if (auditLog.isInfoEnabled()  isExternalInvocation()) {
   logAuditEvent(true, finalizeRollingUpgrade, null, null, null);
 }
-return;
+return returnInfo;
   }
 
   RollingUpgradeInfo finalizeRollingUpgradeInternal(long finalizeTime)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3560180b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
index 9ccdb40..f20fb35 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
@@ -1145,8 +1145,7 @@ class NameNodeRpcServer implements NamenodeProtocols {
 case PREPARE:
   return namesystem.startRollingUpgrade();
 case FINALIZE:
-  namesystem.finalizeRollingUpgrade();
-  return null;
+  return namesystem.finalizeRollingUpgrade();
 default:
   throw new UnsupportedActionException(action +  is not yet supported.);
 }

hadoop git commit: HDFS-7869. Inconsistency in the return information while performing rolling upgrade ( Contributed by J.Andreina )

2015-03-04 Thread vinayakumarb 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 31b3f8460 - c24448c27


HDFS-7869. Inconsistency in the return information while performing rolling 
upgrade ( Contributed by J.Andreina )

(cherry picked from commit 3560180b6e9926aa3ee1357da59b28a4b4689a0d)


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

Branch: refs/heads/branch-2
Commit: c24448c27b91d0398fb42a0a9ab8b8cdd4887647
Parents: 31b3f84
Author: Vinayakumar B vinayakum...@apache.org
Authored: Wed Mar 4 14:38:38 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Wed Mar 4 14:39:51 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt| 3 +++
 .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java   | 6 +++---
 .../apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java  | 3 +--
 .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java   | 2 +-
 .../test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java   | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c24448c2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index bff45bb..6506451 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -777,6 +777,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7682. {{DistributedFileSystem#getFileChecksum}} of a snapshotted file
 includes non-snapshotted content. (Charles Lamb via atm)
 
+HDFS-7869. Inconsistency in the return information while performing rolling
+upgrade ( J.Andreina via vinayakumarb )
+
 BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
   HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c24448c2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 17f313d..81d2b88 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -7475,7 +7475,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 }
   }
 
-  void finalizeRollingUpgrade() throws IOException {
+  RollingUpgradeInfo finalizeRollingUpgrade() throws IOException {
 checkSuperuserPrivilege();
 checkOperation(OperationCategory.WRITE);
 writeLock();
@@ -7483,7 +7483,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 try {
   checkOperation(OperationCategory.WRITE);
   if (!isRollingUpgrade()) {
-return;
+return null;
   }
   checkNameNodeSafeMode(Failed to finalize rolling upgrade);
 
@@ -7508,7 +7508,7 @@ public class FSNamesystem implements Namesystem, 
FSNamesystemMBean,
 if (auditLog.isInfoEnabled()  isExternalInvocation()) {
   logAuditEvent(true, finalizeRollingUpgrade, null, null, null);
 }
-return;
+return returnInfo;
   }
 
   RollingUpgradeInfo finalizeRollingUpgradeInternal(long finalizeTime)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c24448c2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
index a746e8d..b1ae348 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
@@ -1139,8 +1139,7 @@ class NameNodeRpcServer implements NamenodeProtocols {
 case PREPARE:
   return namesystem.startRollingUpgrade();
 case FINALIZE:
-  namesystem.finalizeRollingUpgrade();
-  return null;
+  return namesystem.finalizeRollingUpgrade();
 default:
   throw new UnsupportedActionException(action +  is not yet supported.);