Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 49434200B16 for ; Mon, 20 Jun 2016 19:53:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 47E50160A55; Mon, 20 Jun 2016 17:53:08 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 68A1D160A26 for ; Mon, 20 Jun 2016 19:53:07 +0200 (CEST) Received: (qmail 84197 invoked by uid 500); 20 Jun 2016 17:53:06 -0000 Mailing-List: contact commits-help@aurora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.apache.org Delivered-To: mailing list commits@aurora.apache.org Received: (qmail 84188 invoked by uid 99); 20 Jun 2016 17:53:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2016 17:53:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7ED0EDFC6F; Mon, 20 Jun 2016 17:53:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: serb@apache.org To: commits@aurora.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: aurora-packaging git commit: Improve consistency of the RPM and DEB default configuration Date: Mon, 20 Jun 2016 17:53:06 +0000 (UTC) archived-at: Mon, 20 Jun 2016 17:53:08 -0000 Repository: aurora-packaging Updated Branches: refs/heads/master aa5830237 -> e7fa0096f Improve consistency of the RPM and DEB default configuration * Use identical scheduler default arguments * Log to stderr rather than disk in all packages * Use vagrant as the example role. It is available for all distributions * Use the same clusters.json for all distributions * Rename the clutername from main to example Bugs closed: AURORA-1394 Reviewed at https://reviews.apache.org/r/48606/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/e7fa0096 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/e7fa0096 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/e7fa0096 Branch: refs/heads/master Commit: e7fa0096f17fd27fe9b80fa6778cdb87e5082fc4 Parents: aa58302 Author: Stephan Erb Authored: Mon Jun 20 19:52:36 2016 +0200 Committer: Stephan Erb Committed: Mon Jun 20 19:52:36 2016 +0200 ---------------------------------------------------------------------- specs/debian/aurora-executor.thermos.init | 5 ++--- specs/debian/aurora-scheduler.default | 9 +++------ specs/debian/clusters.json | 2 +- specs/rpm/SOURCES/aurora-scheduler.sysconfig | 7 +++---- specs/rpm/SOURCES/clusters.json | 16 ++++++++++------ test/deb/debian-jessie/README.md | 6 +++--- test/deb/ubuntu-trusty/README.md | 4 ++-- test/rpm/centos-7/README.md | 4 ++-- 8 files changed, 26 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/specs/debian/aurora-executor.thermos.init ---------------------------------------------------------------------- diff --git a/specs/debian/aurora-executor.thermos.init b/specs/debian/aurora-executor.thermos.init index 9bc8675..8ce3911 100755 --- a/specs/debian/aurora-executor.thermos.init +++ b/specs/debian/aurora-executor.thermos.init @@ -39,9 +39,8 @@ ARGS="--port=${OBSERVER_PORT:-1338} --mesos-root=${MESOS_ROOT:-/var/lib/mesos} --app_daemonize --app_pidfile=$PIDFILE - --log_simple - --log_to_disk=google:INFO - --log_dir=/var/log/aurora" + --log_to_disk=NONE + --log_to_stderr=google:INFO" case "$1" in start) http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/specs/debian/aurora-scheduler.default ---------------------------------------------------------------------- diff --git a/specs/debian/aurora-scheduler.default b/specs/debian/aurora-scheduler.default index 71d1625..74e17fa 100644 --- a/specs/debian/aurora-scheduler.default +++ b/specs/debian/aurora-scheduler.default @@ -18,7 +18,7 @@ # Environment variables control the behavior of the Mesos scheduler driver (libmesos). GLOG_v=0 LIBPROCESS_PORT=8083 -#LIBPROCESS_IP=192.168.33.7 +#LIBPROCESS_IP=127.0.0.1 ### ### @@ -39,7 +39,7 @@ HTTP_PORT=8081 QUORUM_SIZE=1 # List of zookeeper endpoints -ZK_ENDPOINTS="localhost:2181" +ZK_ENDPOINTS="127.0.0.1:2181" # Zookeeper path or URL to mesos master MESOS_MASTER="zk://${ZK_ENDPOINTS}/mesos" @@ -65,13 +65,10 @@ THERMOS_EXECUTOR_PATH="/usr/share/aurora/bin/thermos_executor.pex" THERMOS_EXECUTOR_RESOURCES="" # Extra arguments to be passed to the thermos executor -THERMOS_EXECUTOR_FLAGS="" +THERMOS_EXECUTOR_FLAGS="--announcer-ensemble 127.0.0.1:2181" # Container types that are allowed to be used by jobs. ALLOWED_CONTAINER_TYPES="MESOS,DOCKER" -# Scheduler log verbosity -LOG_LEVEL="INFO" - # Any args you want to add to the aurora-scheduler invocation: EXTRA_SCHEDULER_ARGS="" http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/specs/debian/clusters.json ---------------------------------------------------------------------- diff --git a/specs/debian/clusters.json b/specs/debian/clusters.json index 29c2e0b..7857825 100644 --- a/specs/debian/clusters.json +++ b/specs/debian/clusters.json @@ -5,6 +5,6 @@ "scheduler_zk_path": "/aurora/scheduler", "slave_root": "/var/lib/mesos", "slave_run_directory": "latest", - "zk": "127.0.1.1" + "zk": "127.0.0.1" } ] http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/specs/rpm/SOURCES/aurora-scheduler.sysconfig ---------------------------------------------------------------------- diff --git a/specs/rpm/SOURCES/aurora-scheduler.sysconfig b/specs/rpm/SOURCES/aurora-scheduler.sysconfig index d812341..77567c5 100644 --- a/specs/rpm/SOURCES/aurora-scheduler.sysconfig +++ b/specs/rpm/SOURCES/aurora-scheduler.sysconfig @@ -15,9 +15,8 @@ GLOG_v=0 - LIBPROCESS_PORT=8083 -LIBPROCESS_IP='127.0.0.1' +#LIBPROCESS_IP=127.0.0.1 # Flags that control the behavior of the JVM. JAVA_OPTS=( @@ -32,7 +31,7 @@ JAVA_OPTS=( # For a full list of available flags, run /usr/lib/aurora/bin/aurora-scheduler -help AURORA_FLAGS=( # The name of this cluster. - -cluster_name='main' + -cluster_name='example' # The HTTP port upon which Aurora will listen. -http_port=8081 @@ -61,7 +60,7 @@ AURORA_FLAGS=( # https://aurora.apache.org/documentation/latest/deploying-aurora-scheduler/#replicated-log-configuration -native_log_quorum_size='1' # The ZooKeeper ZNode to which Aurora will register the locations of its replicated log. - -native_log_zk_group_path='/aurora/native-log' + -native_log_zk_group_path='/aurora/replicated-log' # The local directory in which an Aurora scheduler can find Aurora's replicated log. -native_log_file_path='/var/lib/aurora/scheduler/db' # The local directory in which Aurora schedulers will place state backups. http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/specs/rpm/SOURCES/clusters.json ---------------------------------------------------------------------- diff --git a/specs/rpm/SOURCES/clusters.json b/specs/rpm/SOURCES/clusters.json index 133013b..7857825 100644 --- a/specs/rpm/SOURCES/clusters.json +++ b/specs/rpm/SOURCES/clusters.json @@ -1,6 +1,10 @@ -[{ - "name": "main", - "zk": "127.0.0.1", - "scheduler_zk_path": "/aurora/scheduler", - "auth_mechanism": "UNAUTHENTICATED" -}] \ No newline at end of file +[ + { + "auth_mechanism": "UNAUTHENTICATED", + "name": "example", + "scheduler_zk_path": "/aurora/scheduler", + "slave_root": "/var/lib/mesos", + "slave_run_directory": "latest", + "zk": "127.0.0.1" + } +] http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/test/deb/debian-jessie/README.md ---------------------------------------------------------------------- diff --git a/test/deb/debian-jessie/README.md b/test/deb/debian-jessie/README.md index b84ffd9..71cde73 100644 --- a/test/deb/debian-jessie/README.md +++ b/test/deb/debian-jessie/README.md @@ -50,13 +50,13 @@ task = SequentialTask( processes = [Process(name = 'hello', cmdline = 'echo hello')], resources = Resources(cpu = 0.5, ram = 128*MB, disk = 128*MB)) jobs = [Service( - task = task, cluster = 'example', role = 'www-data', environment = 'prod', name = 'hello')]" > hello_world.aurora + task = task, cluster = 'example', role = 'vagrant', environment = 'prod', name = 'hello')]" > hello_world.aurora -aurora job create example/www-data/prod/hello hello_world.aurora +aurora job create example/vagrant/prod/hello hello_world.aurora ``` ## Troubleshooting * Mesos: `/var/log/mesos` * Aurora scheduler: `sudo journalctl -u aurora-scheduler` -* Aurora observer: `/var/log/aurora/thermos_observer.log` +* Aurora observer: `sudo journalctl -u thermos` http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/test/deb/ubuntu-trusty/README.md ---------------------------------------------------------------------- diff --git a/test/deb/ubuntu-trusty/README.md b/test/deb/ubuntu-trusty/README.md index bb79341..20f519a 100644 --- a/test/deb/ubuntu-trusty/README.md +++ b/test/deb/ubuntu-trusty/README.md @@ -50,9 +50,9 @@ task = SequentialTask( processes = [Process(name = 'hello', cmdline = 'echo hello')], resources = Resources(cpu = 0.5, ram = 128*MB, disk = 128*MB)) jobs = [Service( - task = task, cluster = 'example', role = 'www-data', environment = 'prod', name = 'hello')]" > hello_world.aurora + task = task, cluster = 'example', role = 'vagrant', environment = 'prod', name = 'hello')]" > hello_world.aurora -aurora job create example/www-data/prod/hello hello_world.aurora +aurora job create example/vagrant/prod/hello hello_world.aurora ``` ## Troubleshooting http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e7fa0096/test/rpm/centos-7/README.md ---------------------------------------------------------------------- diff --git a/test/rpm/centos-7/README.md b/test/rpm/centos-7/README.md index bb34fb6..bd8d033 100644 --- a/test/rpm/centos-7/README.md +++ b/test/rpm/centos-7/README.md @@ -48,9 +48,9 @@ task = SequentialTask( processes = [Process(name = 'hello', cmdline = 'echo hello')], resources = Resources(cpu = 0.5, ram = 128*MB, disk = 128*MB)) jobs = [Service( - task = task, cluster = 'main', role = 'vagrant', environment = 'prod', name = 'hello')]" > hello_world.aurora + task = task, cluster = 'example', role = 'vagrant', environment = 'prod', name = 'hello')]" > hello_world.aurora -aurora job create main/vagrant/prod/hello hello_world.aurora +aurora job create example/vagrant/prod/hello hello_world.aurora ``` ## Troubleshooting