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/11/27 19:56:20 UTC
[asterixdb] branch master updated (311e46d -> f8bf9e7)
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git.
from 311e46d [NO ISSUE] Make MetadataProvider extensible
new e682c94 [NO ISSUE] Increase start timeout to 90s for sample cluster start
new 2292810 Merge branch 'gerrit/stabilization-f69489' into 'gerrit/mad-hatter'
new f8bf9e7 Merge branch 'gerrit/mad-hatter' into 'master'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../asterix-server/src/main/opt/local/bin/start-sample-cluster.bat | 2 +-
asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[asterixdb] 01/03: [NO ISSUE] Increase start timeout to 90s for
sample cluster start
Posted by mb...@apache.org.
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 e682c94fee4b8135369960dfcc9e2187df75c850
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Nov 26 15:47:08 2019 -0500
[NO ISSUE] Increase start timeout to 90s for sample cluster start
Change-Id: I75d14ffe12a59ea84d2cac3cf2853ee86d745bff
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/4364
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
.../asterix-server/src/main/opt/local/bin/start-sample-cluster.bat | 2 +-
asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
index 652abff..1d874c2 100644
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
@@ -108,7 +108,7 @@ start /MIN "red-nc" cmd /c "echo See output in %LOGSDIR%\red-service.log && "%IN
start /MIN "cc" cmd /c "echo See output in %LOGSDIR%\cc.log && "%INSTALLDIR%\bin\${CC_COMMAND}" -config-file "%CLUSTERDIR%\conf\cc.conf" >>"%LOGSDIR%\cc.log" 2>&1"
echo.
-call "%INSTALLDIR%\bin\${HELPER_COMMAND}" wait_for_cluster -timeout 30
+call "%INSTALLDIR%\bin\${HELPER_COMMAND}" wait_for_cluster -timeout 90
if %ERRORLEVEL% EQU 0 (
goto :END
)
diff --git a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index 9268bed..34c3a0f 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -129,5 +129,5 @@ echo "INFO: Starting sample cluster..."
"$INSTALLDIR/bin/${NC_SERVICE_COMMAND}" -logdir - -config-file "$CLUSTERDIR/conf/blue.conf" >> "$LOGSDIR/blue-service.log" 2>&1 &
"$INSTALLDIR/bin/${NC_SERVICE_COMMAND}" -logdir - >> "$LOGSDIR/red-service.log" 2>&1 &
"$INSTALLDIR/bin/${CC_COMMAND}" -config-file "$CLUSTERDIR/conf/cc.conf" >> "$LOGSDIR/cc.log" 2>&1 &
-"$INSTALLDIR/bin/${HELPER_COMMAND}" wait_for_cluster -timeout 30
+"$INSTALLDIR/bin/${HELPER_COMMAND}" wait_for_cluster -timeout 90
exit $?
[asterixdb] 03/03: Merge branch 'gerrit/mad-hatter' into 'master'
Posted by mb...@apache.org.
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 f8bf9e7a05ab1409259c16f8b512c3ef43ff31fc
Merge: 311e46d 2292810
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Nov 26 18:51:58 2019 -0500
Merge branch 'gerrit/mad-hatter' into 'master'
Change-Id: Ib31ef5e0d84c3f66d0f8c7db2af3b05d4f1734f1
.../asterix-server/src/main/opt/local/bin/start-sample-cluster.bat | 2 +-
asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[asterixdb] 02/03: Merge branch 'gerrit/stabilization-f69489' into
'gerrit/mad-hatter'
Posted by mb...@apache.org.
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 22928109577b5022e730fc8428aeacaf1af62e75
Merge: d9a9c14 e682c94
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Nov 26 18:49:55 2019 -0500
Merge branch 'gerrit/stabilization-f69489' into 'gerrit/mad-hatter'
Change-Id: I7eb5133c39ad75e902300cf3fafd943fe253199b
.../asterix-server/src/main/opt/local/bin/start-sample-cluster.bat | 2 +-
asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)