You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2023/09/09 00:28:07 UTC
[asterixdb] 03/04: Merge branch 'gerrit/neo' into 'gerrit/trinity'
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit c1ce6003199c4d0ba9b7e07d8af379d8ede27386
Merge: 604c303c08 72297e24f2
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Sep 8 15:49:42 2023 -0400
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I504ef146b58dc216996b4976937e53088af3c8b4
.../apache/asterix/app/nc/NCAppRuntimeContext.java | 21 +++++++++++++--------
.../asterix/hyracks/bootstrap/CCApplication.java | 12 +++++++-----
.../asterix/hyracks/bootstrap/NCApplication.java | 9 ++++++++-
.../api/common/AsterixHyracksIntegrationUtil.java | 17 ++++++++++++++---
.../metadata/bootstrap/AsterixStateProxy.java | 9 ++++++---
5 files changed, 48 insertions(+), 20 deletions(-)
diff --cc asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index e8c2c1d00f,34f4e40148..1e096ac089
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@@ -130,10 -130,10 +131,10 @@@ public class AsterixHyracksIntegrationU
configManager.processConfig();
ccConfig.setKeyStorePath(joinPath(RESOURCES_PATH, ccConfig.getKeyStorePath()));
ccConfig.setTrustStorePath(joinPath(RESOURCES_PATH, ccConfig.getTrustStorePath()));
- cc = new ClusterControllerService(ccConfig, ccApplication);
+ cc = createCC(ccApplication, ccConfig);
nodeNames = ccConfig.getConfigManager().getNodeNames();
- if (deleteOldInstanceData) {
+ if (deleteOldInstanceData && nodeNames != null) {
deleteTransactionLogs();
removeTestStorageFiles();
deleteCCFiles();