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 2019/03/28 22:50:00 UTC
[asterixdb] 04/04: Merge commit '963a544' from
'stabilization-f69489' to 'master'
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 ac6c1816cd2dc51b1d8c2cd4f71ac3b7510cbc2b
Merge: 6a2a436 963a544
Author: Michael Blow <mb...@apache.org>
AuthorDate: Thu Mar 28 16:39:55 2019 -0400
Merge commit '963a544' from 'stabilization-f69489' to 'master'
Change-Id: Iedb57cd217d3115b94d13761d8779e81293003da
.../apache/asterix/hyracks/bootstrap/CCApplication.java | 2 +-
.../apache/asterix/hyracks/bootstrap/NCApplication.java | 2 +-
.../dataflow/data/nontagged/printers/PrintTools.java | 3 ++-
.../src/test/resources/NCServiceExecutionIT/cc.conf | 2 ++
.../org/apache/hyracks/api/application/IApplication.java | 9 +++++++++
.../org/apache/hyracks/control/cc/BaseCCApplication.java | 3 ++-
.../org/apache/hyracks/control/nc/BaseNCApplication.java | 3 ++-
.../hyracks-examples/btree-example/btreehelper/pom.xml | 4 ++++
.../hyracks/examples/btree/helper/TestNCApplication.java | 6 ++++++
.../org/apache/hyracks/ipc/impl/IPCConnectionManager.java | 15 ++++++++++++++-
.../main/java/org/apache/hyracks/ipc/impl/IPCHandle.java | 1 -
.../hyracks/test/server/process/HyracksCCProcess.java | 1 +
12 files changed, 44 insertions(+), 7 deletions(-)
diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
index 997090e,80f7f10..4213509
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
@@@ -158,12 -156,8 +158,12 @@@ public class NCApplication extends Base
return RecoveryManager::new;
}
+ protected IReceptionistFactory getReceptionistFactory() {
+ return () -> new Receptionist(nodeId);
+ }
+
@Override
- protected void configureLoggingLevel(Level level) {
+ public void configureLoggingLevel(Level level) {
super.configureLoggingLevel(level);
LoggingConfigUtil.defaultIfMissing(GlobalConfig.ASTERIX_LOGGER_NAME, level);
}
diff --cc asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
index f721ae5,c20e7f2..2a92c5d
--- a/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
+++ b/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
@@@ -20,7 -20,9 +20,8 @@@ txn.log.dir=../asterix-server/target/tm
core.dump.dir=../asterix-server/target/tmp/asterix_nc1/coredump
iodevices=../asterix-server/target/tmp/asterix_nc1/iodevice1,../asterix-server/target/tmp/asterix_nc1/iodevice2
nc.api.port=19004
-jvm.args=-Xloggc:/tmp/asterix-server-failsafe/asterix_nc1-%p-gc.log -XX:+PrintGC -XX:+PrintGCDateStamps -XX:GCLogFileSize=10M -XX:+PrintFlagsFinal
#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006
+ jvm.args=-Dfile.encoding=iso-8859-1
[nc/asterix_nc2]
ncservice.port=9091
@@@ -28,7 -30,9 +29,8 @@@ txn.log.dir=../asterix-server/target/tm
core.dump.dir=../asterix-server/target/tmp/asterix_nc2/coredump
iodevices=../asterix-server/target/tmp/asterix_nc2/iodevice1,../asterix-server/target/tmp/asterix_nc2/iodevice2
nc.api.port=19005
-jvm.args=-Xloggc:/tmp/asterix-server-failsafe/asterix_nc2-%p-gc.log -XX:+PrintGC -XX:+PrintGCDateStamps -XX:GCLogFileSize=10M -XX:+PrintFlagsFinal
#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5007
+ jvm.args=-Dfile.encoding=us-ascii
[nc]
address=127.0.0.1
diff --cc hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/src/main/java/org/apache/hyracks/examples/btree/helper/TestNCApplication.java
index 5259856,daeaba3..7ba2050
--- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/src/main/java/org/apache/hyracks/examples/btree/helper/TestNCApplication.java
+++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreehelper/src/main/java/org/apache/hyracks/examples/btree/helper/TestNCApplication.java
@@@ -82,7 -82,7 +83,12 @@@ public class TestNCApplication implemen
}
@Override
+ public void configureLoggingLevel(Level level) {
+ // No-op
+ }
++
++ @Override
+ public IConfigManager getConfigManager() {
+ return configManager;
+ }
}