You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2016/10/14 21:25:42 UTC
asterixdb git commit: cleanup error message
Repository: asterixdb
Updated Branches:
refs/heads/master 858efaea8 -> 4819ea447
cleanup error message
Change-Id: I38e7ae7ae0f55d0bb3bbc46ee5a1e7f604d66c66
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1286
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/4819ea44
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/4819ea44
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/4819ea44
Branch: refs/heads/master
Commit: 4819ea44723b87a68406d248782861cf6e5d3305
Parents: 858efae
Author: Till Westmann <ti...@apache.org>
Authored: Fri Oct 14 11:35:56 2016 -0700
Committer: Yingyi Bu <bu...@gmail.com>
Committed: Fri Oct 14 14:25:20 2016 -0700
----------------------------------------------------------------------
.../apache/asterix/translator/AbstractLangTranslator.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/4819ea44/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
index 9f2d5d8..1abf6c8 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
@@ -65,7 +65,7 @@ public abstract class AbstractLangTranslator {
}
}
if (!ClusterStateManager.INSTANCE.getState().equals(ClusterState.ACTIVE)) {
- throw new AsterixException(" Asterix Cluster is in " + ClusterState.UNUSABLE + " state."
+ throw new AsterixException("Cluster is in " + ClusterState.UNUSABLE + " state."
+ "\n One or more Node Controllers have left or haven't joined yet.\n");
} else {
if (LOGGER.isLoggable(Level.INFO)) {
@@ -75,7 +75,7 @@ public abstract class AbstractLangTranslator {
}
if (ClusterStateManager.INSTANCE.getState().equals(ClusterState.UNUSABLE)) {
- throw new AsterixException(" Asterix Cluster is in " + ClusterState.UNUSABLE + " state."
+ throw new AsterixException("Cluster is in " + ClusterState.UNUSABLE + " state."
+ "\n One or more Node Controllers have left.\n");
}
@@ -83,8 +83,7 @@ public abstract class AbstractLangTranslator {
int maxWaitCycles = AsterixAppContextInfo.INSTANCE.getExternalProperties().getMaxWaitClusterActive();
int waitCycleCount = 0;
try {
- while (!ClusterStateManager.INSTANCE.isGlobalRecoveryCompleted()
- && waitCycleCount < maxWaitCycles) {
+ while (!ClusterStateManager.INSTANCE.isGlobalRecoveryCompleted() && waitCycleCount < maxWaitCycles) {
Thread.sleep(1000);
waitCycleCount++;
}
@@ -94,7 +93,7 @@ public abstract class AbstractLangTranslator {
}
}
if (!ClusterStateManager.INSTANCE.isGlobalRecoveryCompleted()) {
- throw new AsterixException(" Asterix Cluster Global recovery is not yet complete and The system is in "
+ throw new AsterixException("Cluster Global recovery is not yet complete and the system is in "
+ ClusterState.ACTIVE + " state");
}
}