[39/50] [abbrv] hbase git commit: Need to check server when doing ServerCrashProcedure; we had it but I removed it a few patches back... makes for SCPs stamping on each otehr failing ongoing assigns
Need to check server when doing ServerCrashProcedure; we had it but I removed it a few patches back... makes for SCPs stamping on each otehr failing ongoing assigns Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/edad94e0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/edad94e0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/edad94e0 Branch: refs/heads/HBASE-14614 Commit: edad94e0f3771f7daa5f74e19842ce955f2d9f6a Parents: 2e78073 Author: Michael Stack Authored: Sat May 13 21:37:52 2017 -0700 Committer: Michael Stack Committed: Tue May 23 08:36:53 2017 -0700 -- .../hbase/master/assignment/AssignProcedure.java | 8 .../master/assignment/RegionTransitionProcedure.java | 6 ++ .../hbase/master/assignment/UnassignProcedure.java| 5 + .../hbase/master/procedure/ServerCrashException.java | 7 +-- .../hbase/master/procedure/ServerCrashProcedure.java | 14 -- 5 files changed, 36 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/edad94e0/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java index 36f6f08..42ece16 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java @@ -327,4 +327,12 @@ public class AssignProcedure extends RegionTransitionProcedure { super.toStringClassDetails(sb); if (this.targetServer != null) sb.append(", target=").append(this.targetServer); } + + @Override + public ServerName getServer(final MasterProcedureEnv env) { +RegionStateNode node = + env.getAssignmentManager().getRegionStates().getRegionNode(this.getRegionInfo()); +if (node == null) return null; +return node.getRegionLocation(); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/edad94e0/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java index 6dc809b..49124ea 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java @@ -372,4 +372,10 @@ public abstract class RegionTransitionProcedure // the client does not know about this procedure. return false; } + + /** + * Used by ServerCrashProcedure to see if this Assign/Unassign needs processing. + * @return ServerName the Assign or Unassign is going against. + */ + public abstract ServerName getServer(final MasterProcedureEnv env); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/edad94e0/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java index a82a2f5..126718a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java @@ -239,4 +239,9 @@ public class UnassignProcedure extends RegionTransitionProcedure { super.toStringClassDetails(sb); sb.append(", server=").append(this.destinationServer); } + + @Override + public ServerName getServer(final MasterProcedureEnv env) { +return this.destinationServer; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/edad94e0/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java index dd1874b..26aba9e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/proced
[35/50] [abbrv] hbase git commit: Need to check server when doing ServerCrashProcedure; we had it but I removed it a few patches back... makes for SCPs stamping on each otehr failing ongoing assigns
Need to check server when doing ServerCrashProcedure; we had it but I removed it a few patches back... makes for SCPs stamping on each otehr failing ongoing assigns Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b204c48a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b204c48a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b204c48a Branch: refs/heads/HBASE-14614 Commit: b204c48a56f7d79aa7e727e6ad0a138a2bb852ac Parents: 4234664 Author: Michael Stack Authored: Sat May 13 21:37:52 2017 -0700 Committer: Michael Stack Committed: Tue May 23 00:33:03 2017 -0700 -- .../hbase/master/assignment/AssignProcedure.java | 8 .../master/assignment/RegionTransitionProcedure.java | 6 ++ .../hbase/master/assignment/UnassignProcedure.java| 5 + .../hbase/master/procedure/ServerCrashException.java | 7 +-- .../hbase/master/procedure/ServerCrashProcedure.java | 14 -- 5 files changed, 36 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/b204c48a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java index 36f6f08..42ece16 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java @@ -327,4 +327,12 @@ public class AssignProcedure extends RegionTransitionProcedure { super.toStringClassDetails(sb); if (this.targetServer != null) sb.append(", target=").append(this.targetServer); } + + @Override + public ServerName getServer(final MasterProcedureEnv env) { +RegionStateNode node = + env.getAssignmentManager().getRegionStates().getRegionNode(this.getRegionInfo()); +if (node == null) return null; +return node.getRegionLocation(); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/b204c48a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java index 6dc809b..49124ea 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java @@ -372,4 +372,10 @@ public abstract class RegionTransitionProcedure // the client does not know about this procedure. return false; } + + /** + * Used by ServerCrashProcedure to see if this Assign/Unassign needs processing. + * @return ServerName the Assign or Unassign is going against. + */ + public abstract ServerName getServer(final MasterProcedureEnv env); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/b204c48a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java index a82a2f5..126718a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java @@ -239,4 +239,9 @@ public class UnassignProcedure extends RegionTransitionProcedure { super.toStringClassDetails(sb); sb.append(", server=").append(this.destinationServer); } + + @Override + public ServerName getServer(final MasterProcedureEnv env) { +return this.destinationServer; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/b204c48a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java index dd1874b..26aba9e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/proced
hbase git commit: Need to check server when doing ServerCrashProcedure; we had it but I removed it a few patches back... makes for SCPs stamping on each otehr failing ongoing assigns
Repository: hbase Updated Branches: refs/heads/HBASE-14614 61ed02691 -> d43df0ed6 Need to check server when doing ServerCrashProcedure; we had it but I removed it a few patches back... makes for SCPs stamping on each otehr failing ongoing assigns Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d43df0ed Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d43df0ed Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d43df0ed Branch: refs/heads/HBASE-14614 Commit: d43df0ed653b627e3bf1e1f40aa4aac1ae89f300 Parents: 61ed026 Author: Michael Stack Authored: Sat May 13 21:37:52 2017 -0700 Committer: Michael Stack Committed: Sat May 13 21:37:52 2017 -0700 -- .../hbase/master/assignment/AssignProcedure.java | 8 .../master/assignment/RegionTransitionProcedure.java | 6 ++ .../hbase/master/assignment/UnassignProcedure.java| 5 + .../hbase/master/procedure/ServerCrashException.java | 7 +-- .../hbase/master/procedure/ServerCrashProcedure.java | 14 -- 5 files changed, 36 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d43df0ed/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java index 36f6f08..42ece16 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java @@ -327,4 +327,12 @@ public class AssignProcedure extends RegionTransitionProcedure { super.toStringClassDetails(sb); if (this.targetServer != null) sb.append(", target=").append(this.targetServer); } + + @Override + public ServerName getServer(final MasterProcedureEnv env) { +RegionStateNode node = + env.getAssignmentManager().getRegionStates().getRegionNode(this.getRegionInfo()); +if (node == null) return null; +return node.getRegionLocation(); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/d43df0ed/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java index 6dc809b..49124ea 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.java @@ -372,4 +372,10 @@ public abstract class RegionTransitionProcedure // the client does not know about this procedure. return false; } + + /** + * Used by ServerCrashProcedure to see if this Assign/Unassign needs processing. + * @return ServerName the Assign or Unassign is going against. + */ + public abstract ServerName getServer(final MasterProcedureEnv env); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/d43df0ed/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java index a82a2f5..126718a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/UnassignProcedure.java @@ -239,4 +239,9 @@ public class UnassignProcedure extends RegionTransitionProcedure { super.toStringClassDetails(sb); sb.append(", server=").append(this.destinationServer); } + + @Override + public ServerName getServer(final MasterProcedureEnv env) { +return this.destinationServer; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/d43df0ed/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashException.java index dd1874b..