Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1092
Change subject: some cleanup
......................................................................
some cleanup
Change-Id: I3fea28c9e0ea7c3baad1c7a053adabc71bea2a8a
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java
5 files changed, 17 insertions(+), 11 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/92/1092/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index 4b00195..9d778d8 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -69,7 +69,7 @@
for (String ncName : nodes) {
NodeControllerService nodeControllerService = new
NodeControllerService(createNCConfig(ncName));
nodeControllers.add(nodeControllerService);
- Thread ncStartThread = new Thread() {
+ Thread ncStartThread = new Thread("IntegrationUtil-" + ncName) {
@Override
public void run() {
try {
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java
index af8aa31..acef360 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/GlobalRecoveryManager.java
@@ -203,7 +203,7 @@
* Note: Throwing this illegal state exception will
terminate this thread
* and feeds listeners will not be notified.
*/
- LOGGER.severe("Global recovery was not completed
successfully" + e);
+ LOGGER.severe("Global recovery was not completed
successfully: " + e);
try {
MetadataManager.INSTANCE.abortTransaction(mdTxnCtx);
} catch (Exception e1) {
@@ -216,9 +216,18 @@
AsterixClusterProperties.INSTANCE.setGlobalRecoveryCompleted(true);
LOGGER.info("Global Recovery Completed");
}
- });
+ }, "RecoveryThread");
state = newState;
recoveryThread.start();
+ while (recoveryThread.isAlive()) {
+ LOGGER.warning("Recovering ...");
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ LOGGER.severe("Interrupted while waiting for recovery");
+ break;
+ }
+ }
}
}
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 2cd8c46..a72bb78 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -1013,6 +1013,9 @@
IValueExtractor<ResultType> valueExtractor, List<ResultType>
results)
throws MetadataException, IndexException, IOException {
IBinaryComparatorFactory[] comparatorFactories =
index.getKeyBinaryComparatorFactory();
+ if (index.getFile() == null) {
+ throw new MetadataException("No file for Index " +
index.getDataverseName() + "." + index.getIndexName());
+ }
String resourceName = index.getFile().toString();
IIndex indexInstance = datasetLifecycleManager.getIndex(resourceName);
datasetLifecycleManager.open(resourceName);
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
index 757694d..a36558f 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
@@ -265,15 +265,8 @@
public static void insertNodes(MetadataTransactionContext mdTxnCtx) throws
Exception {
Iterator<String> iter = nodeNames.iterator();
- // Set<Entry<String, String[]>> set = nodeStores.entrySet();
- // Iterator<Entry<String, String[]>> im = set.iterator();
-
while (iter.hasNext()) {
- // Map.Entry<String, String[]> me = (Map.Entry<String,
- // String[]>)im.next();
- MetadataManager.INSTANCE.addNode(mdTxnCtx, new Node(iter.next(),
0, 0/*
-
* , me . getValue ( )
-
*/));
+ MetadataManager.INSTANCE.addNode(mdTxnCtx, new Node(iter.next(),
0, 0));
}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java
index 1f61543..4457da0 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/work/WorkQueue.java
@@ -102,6 +102,7 @@
private class WorkerThread extends Thread {
WorkerThread() {
+ setName("Worker" + super.getName());
setDaemon(true);
setPriority(threadPriority);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/1092
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3fea28c9e0ea7c3baad1c7a053adabc71bea2a8a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <[email protected]>
