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 ki...@apache.org on 2015/05/08 16:32:24 UTC
hadoop git commit: HDFS-7894. Rolling upgrade readiness is not
updated in jmx until query command is issued. Contributed by Brahma Reddy
Battula. (cherry picked from commit 6f622672b62aa8d719060063ef0e47480cdc8655)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 bf8be5629 -> 802a5775f
HDFS-7894. Rolling upgrade readiness is not updated in jmx until query command is issued. Contributed by Brahma Reddy Battula.
(cherry picked from commit 6f622672b62aa8d719060063ef0e47480cdc8655)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/802a5775
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/802a5775
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/802a5775
Branch: refs/heads/branch-2
Commit: 802a5775f3522c57c60ae29ecb9533dbbfecfe76
Parents: bf8be56
Author: Kihwal Lee <ki...@apache.org>
Authored: Fri May 8 09:32:07 2015 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Fri May 8 09:32:07 2015 -0500
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hdfs/server/namenode/FSNamesystem.java | 23 ++++++++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/802a5775/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 b158d2a..f5aa336 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -438,6 +438,9 @@ Release 2.7.1 - UNRELEASED
HDFS-8226. Non-HA rollback compatibility broken (J.Andreina via vinayakumarb)
+ HDFS-7894. Rolling upgrade readiness is not updated in jmx until query
+ command is issued. (Brahma Reddy Battula via kihwal)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/802a5775/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 d8ed7ed..3518fc8 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
@@ -7602,11 +7602,30 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
@Override // NameNodeMXBean
public RollingUpgradeInfo.Bean getRollingUpgradeStatus() {
+ if (!isRollingUpgrade()) {
+ return null;
+ }
RollingUpgradeInfo upgradeInfo = getRollingUpgradeInfo();
- if (upgradeInfo != null) {
+ if (upgradeInfo.createdRollbackImages()) {
return new RollingUpgradeInfo.Bean(upgradeInfo);
}
- return null;
+ readLock();
+ try {
+ // check again after acquiring the read lock.
+ upgradeInfo = getRollingUpgradeInfo();
+ if (upgradeInfo == null) {
+ return null;
+ }
+ if (!upgradeInfo.createdRollbackImages()) {
+ boolean hasRollbackImage = this.getFSImage().hasRollbackFSImage();
+ upgradeInfo.setCreatedRollbackImages(hasRollbackImage);
+ }
+ } catch (IOException ioe) {
+ LOG.warn("Encountered exception setting Rollback Image", ioe);
+ } finally {
+ readUnlock();
+ }
+ return new RollingUpgradeInfo.Bean(upgradeInfo);
}
/** Is rolling upgrade in progress? */