You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org> on 2017/02/03 07:51:43 UTC
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Yingyi Bu has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1482
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
18 files changed, 36 insertions(+), 72 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/1
diff --git a/README.md b/README.md
index f6a1c2b..46de2cf 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@
* Start a single-machine AsterixDB instance:
$cd asterixdb/asterix-server/target/asterix-server-*-binary-assembly/
- $./samples/local/bin/start-sample-cluster.sh
+ $./opt/local/bin/start.sh
* Good to go and run queries in your browser at:
diff --git a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
index 32a0180..48aa168 100644
--- a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
+++ b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
@@ -35,33 +35,16 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/samples</directory>
- <outputDirectory>samples</outputDirectory>
+ <directory>src/main/opt</directory>
+ <outputDirectory>opt</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
</excludes>
<filtered>true</filtered>
</fileSet>
<fileSet>
- <directory>src/main/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>**/*.sh</include>
- </includes>
- <filtered>true</filtered>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>src/main/aws</directory>
- <outputDirectory>aws</outputDirectory>
- <excludes>
- <exclude>**/*.sh</exclude>
- </excludes>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>src/main/aws</directory>
- <outputDirectory>aws</outputDirectory>
+ <directory>src/main/opt</directory>
+ <outputDirectory>opt</outputDirectory>
<includes>
<include>**/*.sh</include>
</includes>
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml b/asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
deleted file mode 100644
index bb69b68..0000000
--- a/asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# ------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ------------------------------------------------------------
-
-- name: Ensure the working directory exists
- file:
- path: "{{ binarydir }}"
- state: directory
-
-- name: Unzip binary
- unarchive:
- src: "{{ lookup('pipe', 'ls -1 ' + srcpattern) }}"
- dest: "{{ binarydir }}"
diff --git a/asterixdb/asterix-server/src/main/aws/README b/asterixdb/asterix-server/src/main/opt/aws/README
similarity index 100%
rename from asterixdb/asterix-server/src/main/aws/README
rename to asterixdb/asterix-server/src/main/opt/aws/README
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/aws_start.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
similarity index 100%
rename from asterixdb/asterix-server/src/main/aws/ansible/aws_start.yml
rename to asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/aws_stop.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
similarity index 100%
rename from asterixdb/asterix-server/src/main/aws/ansible/aws_stop.yml
rename to asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/instance_start.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
similarity index 94%
rename from asterixdb/asterix-server/src/main/aws/ansible/instance_start.yml
rename to asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
index 743b70e..27554a9 100644
--- a/asterixdb/asterix-server/src/main/aws/ansible/instance_start.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
@@ -28,7 +28,10 @@
- name: Install JDK
shell: sudo yum -y localinstall jdk-8u121-linux-x64.rpm
- - include: customize_deployment.yml
+ - name: Deploy binaries
+ synchronize:
+ src: "{{ dist }}"
+ dest: "{{ binarydir }}"
- name: Ensure the log directory exists
file:
@@ -49,7 +52,7 @@
tasks:
- include_vars: ../conf/instance_settings.yml
- name: Copy cluster config to CC
- copy:
+ synchronize:
src: /tmp/asterixdb/cc.conf
dest: "{{ basedir }}/cc.conf"
@@ -60,4 +63,3 @@
shell: nohup "{{ cc }}" -config-file "{{ basedir }}/cc.conf" &> "{{ binarydir }}/logs/cc.log" &
async: 10
poll: 0
-
diff --git a/asterixdb/asterix-server/src/main/aws/bin/start.sh b/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
similarity index 75%
rename from asterixdb/asterix-server/src/main/aws/bin/start.sh
rename to asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
index 3779952..b1a3809 100755
--- a/asterixdb/asterix-server/src/main/aws/bin/start.sh
+++ b/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# ------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,15 +18,21 @@
# under the License.
# ------------------------------------------------------------
+pushd `dirname $0` > /dev/null
+SCRIPT_PATH=`pwd -P`
+popd > /dev/null
+AWS_PATH=`dirname "${SCRIPT_PATH}"`
+OPT_PATH=`dirname "${AWS_PATH}"`
+DIST_PATH=`dirname "${OPT_PATH}"`
# Starts an AWS cluster.
-ansible-playbook -i "localhost," ansible/aws_start.yml
+ansible-playbook -i "localhost," $AWS_PATH/ansible/aws_start.yml
# Generates an Ansible inventory file and an AsterixDB configuration file.
temp=/tmp/asterixdb
inventory=$temp/inventory
conf=$temp/cc.conf
-java -cp "../repo/*" org.apache.asterixdb.aws.ConfigGenerator $temp/nodes $inventory $conf
+java -cp "${DIST_PATH}/repo/*" org.apache.asterixdb.aws.ConfigGenerator $temp/nodes $inventory $conf
# Waits a while so that all instances are up and running.
# TODO(yingyi) pull the "status check" field of each instance.
@@ -34,5 +40,5 @@
# Installs asterixdb on all AWS instances.
export ANSIBLE_HOST_KEY_CHECKING=false
-ansible-playbook -i $inventory ansible/instance_start.yml
+ansible-playbook -i $inventory $AWS_PATH/ansible/instance_start.yml
diff --git a/asterixdb/asterix-server/src/main/aws/bin/stop.sh b/asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
similarity index 83%
rename from asterixdb/asterix-server/src/main/aws/bin/stop.sh
rename to asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
index fd2c85b..25521d2 100755
--- a/asterixdb/asterix-server/src/main/aws/bin/stop.sh
+++ b/asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# ------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,6 +18,10 @@
# under the License.
# ------------------------------------------------------------
+pushd `dirname $0` > /dev/null
+SCRIPT_PATH=`pwd -P`
+popd > /dev/null
+AWS_PATH=`dirname "${SCRIPT_PATH}"`
# Terminates an AWS cluster
-ansible-playbook -i "localhost," ansible/aws_stop.yml
+ansible-playbook -i "localhost," $AWS_PATH/ansible/aws_stop.yml
diff --git a/asterixdb/asterix-server/src/main/aws/conf/aws_settings.yml b/asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
similarity index 100%
rename from asterixdb/asterix-server/src/main/aws/conf/aws_settings.yml
rename to asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
diff --git a/asterixdb/asterix-server/src/main/aws/conf/instance_settings.yml b/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
similarity index 88%
rename from asterixdb/asterix-server/src/main/aws/conf/instance_settings.yml
rename to asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
index de83b7c..d2a9ace 100644
--- a/asterixdb/asterix-server/src/main/aws/conf/instance_settings.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
@@ -20,9 +20,6 @@
# The name of the product (or extension) being used.
product: asterixdb
-# The server binary zip.
-binary: asterix-server-*-binary-assembly.zip
-
# The script that starts a nc service.
ncsbin: "asterixncservice"
@@ -38,8 +35,8 @@
# The working directory.
binarydir: "{{ basedir }}/{{ product }}"
-# The pattern for retrieving the sever binary zip from the current build.
-srcpattern: "../../../{{ binary }}"
+# The full binary distribution directory.
+dist: "../../../"
# The nc service command (script).
ncservice: "{{ binarydir}}/bin/{{ ncsbin }}"
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat b/asterixdb/asterix-server/src/main/opt/local/bin/start.bat
similarity index 95%
rename from asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
rename to asterixdb/asterix-server/src/main/opt/local/bin/start.bat
index 580e1e0..2fff45c 100644
--- a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start.bat
@@ -88,7 +88,7 @@
echo ERROR: sample cluster address [localhost:${LISTEN_PORT}] already in use
goto :ERROR
)
-set tempfile="%TEMP%\start-sample-cluster-%random%"
+set tempfile="%TEMP%\start-%random%"
wmic process where ^
"name='java.exe' and CommandLine like '%%org.codehaus.mojo.appassembler.booter.AppassemblerBooter%%' and (CommandLine like '%%app.name=\"%%[cn]c\"%%' or CommandLine like '%%app.name=\"%%ncservice\"%%')" ^
@@ -106,7 +106,7 @@
) else (
echo %severity%: ${PRODUCT} processes are already running; aborting"
echo.
- echo Re-run with -f to ignore, or run stop-sample-cluster.bat -f to forcibly terminate all running ${PRODUCT} processes:
+ echo Re-run with -f to ignore, or run stop.bat -f to forcibly terminate all running ${PRODUCT} processes:
for /F "skip=1" %%P in ('type %tempfile%') DO @echo - %%P
del %tempfile%
exit /B 1
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh b/asterixdb/asterix-server/src/main/opt/local/bin/start.sh
similarity index 95%
rename from asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
rename to asterixdb/asterix-server/src/main/opt/local/bin/start.sh
index d702e8a..66db660 100755
--- a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start.sh
@@ -79,7 +79,7 @@
else
echo "aborting"
echo
- echo "Re-run with -f to ignore, or run stop-sample-cluster.sh -f to forcibly terminate all running ${PRODUCT} processes:"
+ echo "Re-run with -f to ignore, or run stop.sh -f to forcibly terminate all running ${PRODUCT} processes:"
cat /tmp/$$_jps | sed 's/^/ - /'
rm /tmp/$$_jps
exit 1
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat b/asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
similarity index 97%
rename from asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
rename to asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
index 7ac9483..2a32d07 100644
--- a/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
@@ -76,7 +76,7 @@
cd %CLUSTERDIR%\..\..
set INSTALLDIR=%cd%
-set tempfile="%TEMP%\stop-sample-cluster-%random%"
+set tempfile="%TEMP%\stop-%random%"
call %INSTALLDIR%\bin\${HELPER_COMMAND} get_cluster_state -quiet
if %ERRORLEVEL% EQU 1 (
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh b/asterixdb/asterix-server/src/main/opt/local/bin/stop.sh
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh
rename to asterixdb/asterix-server/src/main/opt/local/bin/stop.sh
diff --git a/asterixdb/asterix-server/src/main/samples/local/conf/blue.conf b/asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/conf/blue.conf
rename to asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
diff --git a/asterixdb/asterix-server/src/main/samples/local/conf/cc.conf b/asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/conf/cc.conf
rename to asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
index 0991d4f..5d462a8 100644
--- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
+++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
@@ -54,7 +54,7 @@
// src/test/resources/NCServiceExecutionIT/cc.conf.
private static final String OUTPUT_DIR = joinPath(TARGET_DIR, "sample-local-cluster");
- private static final String LOCAL_SAMPLES_DIR = joinPath(OUTPUT_DIR, "samples", "local");
+ private static final String LOCAL_SAMPLES_DIR = joinPath(OUTPUT_DIR, "opt", "local");
@Rule
public TestRule watcher = new TestMethodTracer();
@@ -78,10 +78,10 @@
@Test
public void test0_startCluster() throws Exception {
- Process process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh"), "-f")
+ Process process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop.sh"), "-f")
.inheritIO().start();
Assert.assertEquals(0, process.waitFor());
- process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/start-sample-cluster.sh")).inheritIO().start();
+ process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/start.sh")).inheritIO().start();
Assert.assertEquals(0, process.waitFor());
}
@@ -97,7 +97,7 @@
@Test
public void test2_stopCluster() throws Exception {
- Process process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh"))
+ Process process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop.sh"))
.inheritIO().start();
Assert.assertEquals(0, process.waitFor());
try {
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 6:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/479/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 8: BAD+1
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/499/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
(9 comments)
I didn't see anything scary, but then I don't know e.g. ansible well enough to understand the details - and I haven't tested the aws deployment ...
I have one thought on the script names in README.md - I hope that this makes sense.
https://asterix-gerrit.ics.uci.edu/#/c/1482/5//COMMIT_MSG
Commit Message:
PS5, Line 7: Change "samples" to "opt" in the distribution package.
> To me, they're all configurable *DB runnables/installers.
It seems that they are all different deployment options for an *DB cluster so far.
I also see that there might be other things that we'd like to ship/install alongside our binaries, but I wouldn't introduce another layer right now. I'd propose to reorganize again when we see the need or when we find a layout that we'd like to align with - I think that we still have some freedom to move as we're not even 1.0 :)
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/README.md
File README.md:
PS5, Line 79: start
I'd keep the "sample-cluster" in the name. The directory "local" already has a potential for confusion (e.g. due to the use of "local" in UNIX filesystem layouts) and so being more explicit in the name of the start/stop scripts seems to be a good idea. I also makes it clearer, that this is not really a suggested deployment option.
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/main/opt/local/bin/start.bat
File asterixdb/asterix-server/src/main/opt/local/bin/start.bat:
PS5, Line 91: start
I'd also leave "sample-cluster" here.
PS5, Line 109: stop
I'd also leave "sample-cluster" here.
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/main/opt/local/bin/start.sh
File asterixdb/asterix-server/src/main/opt/local/bin/start.sh:
PS5, Line 82: stop
I'd also leave "sample-cluster" here.
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
File asterixdb/asterix-server/src/main/opt/local/bin/stop.bat:
PS5, Line 79: stop
I'd also leave "sample-cluster" here.
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
File asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java:
PS5, Line 81: stop
I'd also leave "sample-cluster" here.
PS5, Line 84: start
I'd also leave "sample-cluster" here.
PS5, Line 100: stop
I'd also leave "sample-cluster" here.
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: Yes
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 4:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4168/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 8:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4220/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 6: Code-Review+2
(5 comments)
https://asterix-gerrit.ics.uci.edu/#/c/1482/6/asterixdb/asterix-server/src/main/opt/aws/README
File asterixdb/asterix-server/src/main/opt/aws/README:
PS6, Line 23: Sets
s/Sets/Set/
PS6, Line 26: key pair
s/key pair/EC2 key pair/
PS6, Line 27: AWS
s/AWS/AWS IAM/
PS6, Line 28: AWS
s/AWS/AWS IAM/
PS6, Line 46: boto3
I needed to install boto. Not sure if that's the only thing I need as I installed boto3 as well.
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: Yes
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Yingyi Bu has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 6:
(8 comments)
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/README.md
File README.md:
PS5, Line 79: start
> I'd keep the "sample-cluster" in the name. The directory "local" already ha
Done
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/main/opt/local/bin/start.bat
File asterixdb/asterix-server/src/main/opt/local/bin/start.bat:
PS5, Line 91:
> I'd also leave "sample-cluster" here.
Done
PS5, Line 109:
> I'd also leave "sample-cluster" here.
Done
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/main/opt/local/bin/start.sh
File asterixdb/asterix-server/src/main/opt/local/bin/start.sh:
PS5, Line 82:
> I'd also leave "sample-cluster" here.
Done
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
File asterixdb/asterix-server/src/main/opt/local/bin/stop.bat:
PS5, Line 79:
> I'd also leave "sample-cluster" here.
Done
https://asterix-gerrit.ics.uci.edu/#/c/1482/5/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
File asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java:
PS5, Line 81: stop
> I'd also leave "sample-cluster" here.
Done
PS5, Line 84: start
> I'd also leave "sample-cluster" here.
Done
PS5, Line 100: stop
> I'd also leave "sample-cluster" here.
Done
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: Yes
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1: Integration-Tests-1
Integration Tests Timed Out
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1779/ : ABORTED
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/446/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1482
to look at the new patch set (#6).
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 40 insertions(+), 75 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/6
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/471/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 3:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/464/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1482
to look at the new patch set (#2).
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 43 insertions(+), 76 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 8:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1834/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5: BAD+1
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/471/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
Integration Tests Failed
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1781/ : UNSTABLE
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 6:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1811/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 7:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4219/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 7
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/1482/5//COMMIT_MSG
Commit Message:
PS5, Line 7: Change "samples" to "opt" in the distribution package.
> Here you go:
Do we anticipate other samples? Should we move samples under opt instead of renaming samples to opt?
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: Yes
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1482
to look at the new patch set (#4).
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 47 insertions(+), 82 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/4
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4152/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Yingyi Bu has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/1482/5//COMMIT_MSG
Commit Message:
PS5, Line 7: Change "samples" to "opt" in the distribution package.
> Do we anticipate other samples? Should we move samples under opt instead o
To me, they're all configurable *DB runnables/installers.
Here is what I anticipate:
opt
-- local (local machine installer)
-- ansible (password-less cluster installer)
-- aws (aws installer)
-- docker (TBD)
-- azure (TBD)
Samples seem to usually be used for this kind of things?
https://github.com/Microsoft/sql-server-samples
We could have "samples" under the root or "opt", but I guess it's sth. like this:
samples
-- BigFun application
-- Gleambook application
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: Yes
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 3:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4164/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1482
to look at the new patch set (#3).
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 44 insertions(+), 77 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/3
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4177/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org>.
Michael Blow has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/1482/5//COMMIT_MSG
Commit Message:
PS5, Line 7: Change "samples" to "opt" in the distribution package.
What does 'opt' stand for? What is the motivation for this change?
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: Yes
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 6:
Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/4193/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1482
to look at the new patch set (#5).
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 47 insertions(+), 82 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/5
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Till Westmann, Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1482
to look at the new patch set (#7).
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 47 insertions(+), 81 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/7
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 7
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 6: BAD+1
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/479/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1782/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 8:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/499/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
Integration Tests Failed
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1782/ : UNSTABLE
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Yingyi Bu has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
(1 comment)
https://asterix-gerrit.ics.uci.edu/#/c/1482/5//COMMIT_MSG
Commit Message:
PS5, Line 7: Change "samples" to "opt" in the distribution package.
> What does 'opt' stand for? What is the motivation for this change?
Here you go:
http://unix.stackexchange.com/questions/11544/what-is-the-difference-between-opt-and-usr-local
The motivation is to use opt/ to hold add-on binaries, e.g.,
-- local, for local machine installation
-- aws, for aws installation
-- ansible, for password-less ssh based installtion.
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: Yes
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 3: BAD+1
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/464/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1801/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 6: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1811/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 3: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1794/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1: BAD-1
BAD Compatibility Tests Failed
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/446/ : FAILURE
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1779/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 8: Verified+1
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Yingyi Bu (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Till Westmann, Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/1482
to look at the new patch set (#8).
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 47 insertions(+), 81 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/1482/8
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 3:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1794/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/455/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1: BAD+1
BAD Compatibility Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/455/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 1:
Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1781/
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has submitted this change and it was merged.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Change "samples" to "opt" in the distribution package.
This change also does the following things:
- make AWS script more robust: (1) can be run from anywhere,
(2) eliminate the need of customize_deployment.yml.
- cleanup documentation to reflect the directory structure
change.
- fix Managix zip to be able to directories deeper than 2 levels.
Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1482
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Tested-by: Ian Maxon <im...@apache.org>
BAD: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
M README.md
M asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
M asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
D asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
R asterixdb/asterix-server/src/main/opt/aws/README
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
R asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
R asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
R asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
R asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
R asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
R asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
R asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
R asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
19 files changed, 47 insertions(+), 81 deletions(-)
Approvals:
Ian Maxon: Verified
Till Westmann: Looks good to me, approved
Jenkins: No violations found; No violations found; Verified
diff --git a/README.md b/README.md
index f6a1c2b..7f28757 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@
* Start a single-machine AsterixDB instance:
$cd asterixdb/asterix-server/target/asterix-server-*-binary-assembly/
- $./samples/local/bin/start-sample-cluster.sh
+ $./opt/local/bin/start-sample-cluster.sh
* Good to go and run queries in your browser at:
diff --git a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
index 9b22396..b6cc339 100644
--- a/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
+++ b/asterixdb/asterix-events/src/main/java/org/apache/asterix/event/service/AsterixEventServiceUtil.java
@@ -71,6 +71,7 @@
public static final int CLUSTER_NET_PORT_DEFAULT = 1098;
public static final int CLIENT_NET_PORT_DEFAULT = 1099;
public static final int HTTP_PORT_DEFAULT = 8888;
+ private static final String EMPTY_STRING = "";
public static final String MANAGIX_CONF_XML = "conf" + File.separator + "managix-conf.xml";
@@ -345,25 +346,23 @@
public static void zipDir(File sourceDir, File destFile) throws IOException {
FileOutputStream fos = new FileOutputStream(destFile);
ZipOutputStream zos = new ZipOutputStream(fos);
- zipDir(sourceDir, destFile, zos);
+ zipDir(EMPTY_STRING, sourceDir, destFile, zos);
zos.close();
}
- private static void zipDir(File sourceDir, final File destFile, ZipOutputStream zos) throws IOException {
- File[] dirList = sourceDir.listFiles(new FileFilter() {
- public boolean accept(File f) {
- return !f.getName().endsWith(destFile.getName());
- }
- });
+ private static void zipDir(String prefix, File sourceDir, final File destFile, ZipOutputStream zos)
+ throws IOException {
+ File[] dirList = sourceDir.listFiles(f->!f.getName().endsWith(destFile.getName()));
+ String newPrefix = prefix.equals(EMPTY_STRING) ? prefix : prefix + File.separator;
for (int i = 0; i < dirList.length; i++) {
File f = dirList[i];
if (f.isDirectory()) {
- zipDir(f, destFile, zos);
+ zipDir(newPrefix + f.getName(), f, destFile, zos);
} else {
int bytesIn = 0;
byte[] readBuffer = new byte[2156];
FileInputStream fis = new FileInputStream(f);
- ZipEntry entry = new ZipEntry(sourceDir.getName() + File.separator + f.getName());
+ ZipEntry entry = new ZipEntry(newPrefix + f.getName());
zos.putNextEntry(entry);
while ((bytesIn = fis.read(readBuffer)) != -1) {
zos.write(readBuffer, 0, bytesIn);
diff --git a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
index 32a0180..48aa168 100644
--- a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
+++ b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
@@ -35,33 +35,16 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/main/samples</directory>
- <outputDirectory>samples</outputDirectory>
+ <directory>src/main/opt</directory>
+ <outputDirectory>opt</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
</excludes>
<filtered>true</filtered>
</fileSet>
<fileSet>
- <directory>src/main/samples</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>**/*.sh</include>
- </includes>
- <filtered>true</filtered>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>src/main/aws</directory>
- <outputDirectory>aws</outputDirectory>
- <excludes>
- <exclude>**/*.sh</exclude>
- </excludes>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>src/main/aws</directory>
- <outputDirectory>aws</outputDirectory>
+ <directory>src/main/opt</directory>
+ <outputDirectory>opt</outputDirectory>
<includes>
<include>**/*.sh</include>
</includes>
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml b/asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
deleted file mode 100644
index bb69b68..0000000
--- a/asterixdb/asterix-server/src/main/aws/ansible/customize_deployment.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# ------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ------------------------------------------------------------
-
-- name: Ensure the working directory exists
- file:
- path: "{{ binarydir }}"
- state: directory
-
-- name: Unzip binary
- unarchive:
- src: "{{ lookup('pipe', 'ls -1 ' + srcpattern) }}"
- dest: "{{ binarydir }}"
diff --git a/asterixdb/asterix-server/src/main/aws/README b/asterixdb/asterix-server/src/main/opt/aws/README
similarity index 80%
rename from asterixdb/asterix-server/src/main/aws/README
rename to asterixdb/asterix-server/src/main/opt/aws/README
index ebd8fee..b071ca2 100644
--- a/asterixdb/asterix-server/src/main/aws/README
+++ b/asterixdb/asterix-server/src/main/opt/aws/README
@@ -20,12 +20,12 @@
To start an AWS cluster, you need to do the following steps:
1. Create an AWS account and an IAM user.
- Sets up a security group that you'd like to use for your AWS cluster. The security group should at least allow
+ Set up a security group that you'd like to use for your AWS cluster. The security group should at least allow
all TCP connection from anywhere.
-2. Retrieve your AWS key pair name and fill that after "keypair:" in conf/aws_settings.yml;
- retrieve your AWS "access key ID" and fill that after "access_key_id:" in conf/aws_settings.yml;
- retrieve your AWS "secret access key" and fill that after "secret_access_key:" in conf/aws_settings.yml.
+2. Retrieve your AWS EC2 key pair name and fill that after "keypair:" in conf/aws_settings.yml;
+ retrieve your AWS IAM "access key ID" and fill that after "access_key_id:" in conf/aws_settings.yml;
+ retrieve your AWS IAM "secret access key" and fill that after "secret_access_key:" in conf/aws_settings.yml.
Note that you can only read or download "access key ID" and "secret access key" once from your AWS console.
If you forget them, you have to create new keys again and delete the old ones.
@@ -41,8 +41,9 @@
Host *.amazonaws.com
IdentityFile ~/.ssh/id_rsa
-5. Install ansible and boto3:
- ansible: http://docs.ansible.com/ansible/intro_installation.html
+5. Install ansible, boto, and boto3:
+ ansible: pip install ansible
+ boto: pip install boto
boto3: pip install boto3
6. Launch your cluster instance on AWS:
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/aws_start.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
similarity index 100%
rename from asterixdb/asterix-server/src/main/aws/ansible/aws_start.yml
rename to asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/aws_stop.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
similarity index 100%
rename from asterixdb/asterix-server/src/main/aws/ansible/aws_stop.yml
rename to asterixdb/asterix-server/src/main/opt/aws/ansible/aws_stop.yml
diff --git a/asterixdb/asterix-server/src/main/aws/ansible/instance_start.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
similarity index 94%
rename from asterixdb/asterix-server/src/main/aws/ansible/instance_start.yml
rename to asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
index 743b70e..27554a9 100644
--- a/asterixdb/asterix-server/src/main/aws/ansible/instance_start.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
@@ -28,7 +28,10 @@
- name: Install JDK
shell: sudo yum -y localinstall jdk-8u121-linux-x64.rpm
- - include: customize_deployment.yml
+ - name: Deploy binaries
+ synchronize:
+ src: "{{ dist }}"
+ dest: "{{ binarydir }}"
- name: Ensure the log directory exists
file:
@@ -49,7 +52,7 @@
tasks:
- include_vars: ../conf/instance_settings.yml
- name: Copy cluster config to CC
- copy:
+ synchronize:
src: /tmp/asterixdb/cc.conf
dest: "{{ basedir }}/cc.conf"
@@ -60,4 +63,3 @@
shell: nohup "{{ cc }}" -config-file "{{ basedir }}/cc.conf" &> "{{ binarydir }}/logs/cc.log" &
async: 10
poll: 0
-
diff --git a/asterixdb/asterix-server/src/main/aws/bin/start.sh b/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
similarity index 72%
rename from asterixdb/asterix-server/src/main/aws/bin/start.sh
rename to asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
index 3779952..eebdb9c 100755
--- a/asterixdb/asterix-server/src/main/aws/bin/start.sh
+++ b/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# ------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,15 +18,22 @@
# under the License.
# ------------------------------------------------------------
+# Gets the absolute path so that the script can work no matter where it is invoked.
+pushd `dirname $0` > /dev/null
+SCRIPT_PATH=`pwd -P`
+popd > /dev/null
+AWS_PATH=`dirname "${SCRIPT_PATH}"`
+OPT_PATH=`dirname "${AWS_PATH}"`
+DIST_PATH=`dirname "${OPT_PATH}"`
# Starts an AWS cluster.
-ansible-playbook -i "localhost," ansible/aws_start.yml
+ansible-playbook -i "localhost," $AWS_PATH/ansible/aws_start.yml
# Generates an Ansible inventory file and an AsterixDB configuration file.
temp=/tmp/asterixdb
inventory=$temp/inventory
conf=$temp/cc.conf
-java -cp "../repo/*" org.apache.asterixdb.aws.ConfigGenerator $temp/nodes $inventory $conf
+java -cp "${DIST_PATH}/repo/*" org.apache.asterixdb.aws.ConfigGenerator $temp/nodes $inventory $conf
# Waits a while so that all instances are up and running.
# TODO(yingyi) pull the "status check" field of each instance.
@@ -34,5 +41,5 @@
# Installs asterixdb on all AWS instances.
export ANSIBLE_HOST_KEY_CHECKING=false
-ansible-playbook -i $inventory ansible/instance_start.yml
+ansible-playbook -i $inventory $AWS_PATH/ansible/instance_start.yml
diff --git a/asterixdb/asterix-server/src/main/aws/bin/stop.sh b/asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
similarity index 75%
rename from asterixdb/asterix-server/src/main/aws/bin/stop.sh
rename to asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
index fd2c85b..0f8bf98 100755
--- a/asterixdb/asterix-server/src/main/aws/bin/stop.sh
+++ b/asterixdb/asterix-server/src/main/opt/aws/bin/stop.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
# ------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,6 +18,11 @@
# under the License.
# ------------------------------------------------------------
+# Gets the absolute path so that the script can work no matter where it is invoked.
+pushd `dirname $0` > /dev/null
+SCRIPT_PATH=`pwd -P`
+popd > /dev/null
+AWS_PATH=`dirname "${SCRIPT_PATH}"`
-# Terminates an AWS cluster
-ansible-playbook -i "localhost," ansible/aws_stop.yml
+# Terminates an AWS cluster.
+ansible-playbook -i "localhost," $AWS_PATH/ansible/aws_stop.yml
diff --git a/asterixdb/asterix-server/src/main/aws/conf/aws_settings.yml b/asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
similarity index 100%
rename from asterixdb/asterix-server/src/main/aws/conf/aws_settings.yml
rename to asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
diff --git a/asterixdb/asterix-server/src/main/aws/conf/instance_settings.yml b/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
similarity index 88%
rename from asterixdb/asterix-server/src/main/aws/conf/instance_settings.yml
rename to asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
index de83b7c..d2a9ace 100644
--- a/asterixdb/asterix-server/src/main/aws/conf/instance_settings.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
@@ -20,9 +20,6 @@
# The name of the product (or extension) being used.
product: asterixdb
-# The server binary zip.
-binary: asterix-server-*-binary-assembly.zip
-
# The script that starts a nc service.
ncsbin: "asterixncservice"
@@ -38,8 +35,8 @@
# The working directory.
binarydir: "{{ basedir }}/{{ product }}"
-# The pattern for retrieving the sever binary zip from the current build.
-srcpattern: "../../../{{ binary }}"
+# The full binary distribution directory.
+dist: "../../../"
# The nc service command (script).
ncservice: "{{ binarydir}}/bin/{{ ncsbin }}"
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
rename to asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.bat
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
rename to asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
rename to asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.bat
diff --git a/asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh b/asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh
rename to asterixdb/asterix-server/src/main/opt/local/bin/stop-sample-cluster.sh
diff --git a/asterixdb/asterix-server/src/main/samples/local/conf/blue.conf b/asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/conf/blue.conf
rename to asterixdb/asterix-server/src/main/opt/local/conf/blue.conf
diff --git a/asterixdb/asterix-server/src/main/samples/local/conf/cc.conf b/asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
similarity index 100%
rename from asterixdb/asterix-server/src/main/samples/local/conf/cc.conf
rename to asterixdb/asterix-server/src/main/opt/local/conf/cc.conf
diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
index 0991d4f..c926ec0 100644
--- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
+++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
@@ -54,7 +54,7 @@
// src/test/resources/NCServiceExecutionIT/cc.conf.
private static final String OUTPUT_DIR = joinPath(TARGET_DIR, "sample-local-cluster");
- private static final String LOCAL_SAMPLES_DIR = joinPath(OUTPUT_DIR, "samples", "local");
+ private static final String LOCAL_SAMPLES_DIR = joinPath(OUTPUT_DIR, "opt", "local");
@Rule
public TestRule watcher = new TestMethodTracer();
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 9
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 8: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 5: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1801/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-HasComments: No
Change in asterixdb[master]: Change "samples" to "opt" in the distribution package.
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Change "samples" to "opt" in the distribution package.
......................................................................
Patch Set 8: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/1834/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/1482
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie7876376d089b9ebebba3d37ac90ac346a741be3
Gerrit-PatchSet: 8
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Yingyi Bu <bu...@gmail.com>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No