You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@aurora.apache.org by John Sirois <js...@apache.org> on 2016/04/16 01:08:36 UTC
Review Request 46286: Plumb Curator discovery as an option.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/
-----------------------------------------------------------
Review request for Aurora, Bill Farner and Zameer Manji.
Bugs: AURORA-1468
https://issues.apache.org/jira/browse/AURORA-1468
Repository: aurora
Description
-------
This Adds a Guice module for the Curator discovery implementations and
re-works the `ServiceDiscoveryModule` to optionally bind it when the new
`-zk_use_curator` flag is set.
config/legacy_untested_classes.txt | 6 +-
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
17 files changed, 605 insertions(+), 263 deletions(-)
Diffs
-----
config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
Diff: https://reviews.apache.org/r/46286/diff/
Testing
-------
Locally green:
```
./gradlew -Pq build
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
```
The e2e is also green under Curator with the edit:
```diff
diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
index b9732d2..084016a 100644
--- a/examples/vagrant/upstart/aurora-scheduler.conf
+++ b/examples/vagrant/upstart/aurora-scheduler.conf
@@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
-native_log_quorum_size=1 \
+ -zk_use_curator \
-zk_endpoints=localhost:2181 \
```
I left things as-is for this RB though.
Thanks,
John Sirois
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by Aurora ReviewBot <wf...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129211
-----------------------------------------------------------
Ship it!
Master (81f52e4) is green with this patch.
./build-support/jenkins/build.sh
I will refresh this build result if you post a review containing "@ReviewBot retry"
- Aurora ReviewBot
On April 15, 2016, 11:13 p.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 15, 2016, 11:13 p.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by Aurora ReviewBot <wf...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129221
-----------------------------------------------------------
Ship it!
Master (81f52e4) is green with this patch.
./build-support/jenkins/build.sh
I will refresh this build result if you post a review containing "@ReviewBot retry"
- Aurora ReviewBot
On April 15, 2016, 11:54 p.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 15, 2016, 11:54 p.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by John Sirois <js...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/
-----------------------------------------------------------
(Updated April 18, 2016, 12:25 p.m.)
Review request for Aurora, Bill Farner and Zameer Manji.
Bugs: AURORA-1468 and AURORA-1669
https://issues.apache.org/jira/browse/AURORA-1468
https://issues.apache.org/jira/browse/AURORA-1669
Repository: aurora
Description
-------
This Adds a Guice module for the Curator discovery implementations and
re-works the `ServiceDiscoveryModule` to optionally bind it when the new
`-zk_use_curator` flag is set.
config/legacy_untested_classes.txt | 6 +-
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
17 files changed, 605 insertions(+), 263 deletions(-)
Diffs
-----
RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
Diff: https://reviews.apache.org/r/46286/diff/
Testing
-------
Locally green:
```
./gradlew -Pq build
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
```
Also, `./gradle run` succeeds in propping up a local scheduler that works.
The e2e is also green under Curator with the edit:
```diff
diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
index b9732d2..084016a 100644
--- a/examples/vagrant/upstart/aurora-scheduler.conf
+++ b/examples/vagrant/upstart/aurora-scheduler.conf
@@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
-native_log_quorum_size=1 \
+ -zk_use_curator \
-zk_endpoints=localhost:2181 \
```
I left things as-is for this RB though.
Thanks,
John Sirois
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by John Sirois <js...@apache.org>.
> On April 18, 2016, 11:58 a.m., Zameer Manji wrote:
> > Can you file a ticket to make this default in 0.15?
>
> Bill Farner wrote:
> Is there a reason to even do a release with both implementations? (i.e. i propose we kill the commons one in a matter of weeks) Having the ability to toggle between implementations is handy for now, but i loathe the idea of living with 2 for long at all.
It seems to me both impl should live until we have 1 or more production users the tires with real results of deploy, forced kills, etc. This is important enough it should be evidence-based instead of time-based IMO.
- John
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129380
-----------------------------------------------------------
On April 16, 2016, 10:10 a.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 16, 2016, 10:10 a.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by John Sirois <js...@apache.org>.
> On April 18, 2016, 11:58 a.m., Zameer Manji wrote:
> > Can you file a ticket to make this default in 0.15?
>
> Bill Farner wrote:
> Is there a reason to even do a release with both implementations? (i.e. i propose we kill the commons one in a matter of weeks) Having the ability to toggle between implementations is handy for now, but i loathe the idea of living with 2 for long at all.
>
> John Sirois wrote:
> It seems to me both impl should live until we have 1 or more production users the tires with real results of deploy, forced kills, etc. This is important enough it should be evidence-based instead of time-based IMO.
>
> Bill Farner wrote:
> I agree with the above, iff we have someone volunteer to be the production guinea pig.
Filed with my spin on this: https://issues.apache.org/jira/browse/AURORA-1669
- John
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129380
-----------------------------------------------------------
On April 16, 2016, 10:10 a.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 16, 2016, 10:10 a.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by Bill Farner <wf...@apache.org>.
> On April 18, 2016, 10:58 a.m., Zameer Manji wrote:
> > Can you file a ticket to make this default in 0.15?
>
> Bill Farner wrote:
> Is there a reason to even do a release with both implementations? (i.e. i propose we kill the commons one in a matter of weeks) Having the ability to toggle between implementations is handy for now, but i loathe the idea of living with 2 for long at all.
>
> John Sirois wrote:
> It seems to me both impl should live until we have 1 or more production users the tires with real results of deploy, forced kills, etc. This is important enough it should be evidence-based instead of time-based IMO.
I agree with the above, iff we have someone volunteer to be the production guinea pig.
- Bill
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129380
-----------------------------------------------------------
On April 16, 2016, 9:10 a.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 16, 2016, 9:10 a.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by Bill Farner <wf...@apache.org>.
> On April 18, 2016, 10:58 a.m., Zameer Manji wrote:
> > Can you file a ticket to make this default in 0.15?
Is there a reason to even do a release with both implementations? (i.e. i propose we kill the commons one in a matter of weeks) Having the ability to toggle between implementations is handy for now, but i loathe the idea of living with 2 for long at all.
- Bill
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129380
-----------------------------------------------------------
On April 16, 2016, 9:10 a.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 16, 2016, 9:10 a.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by Zameer Manji <zm...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129380
-----------------------------------------------------------
Ship it!
Can you file a ticket to make this default in 0.15?
- Zameer Manji
On April 16, 2016, 9:10 a.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 16, 2016, 9:10 a.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by Bill Farner <wf...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129394
-----------------------------------------------------------
Ship it!
Ship It!
- Bill Farner
On April 16, 2016, 9:10 a.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 16, 2016, 9:10 a.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by Aurora ReviewBot <wf...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129249
-----------------------------------------------------------
Ship it!
Master (81f52e4) is green with this patch.
./build-support/jenkins/build.sh
I will refresh this build result if you post a review containing "@ReviewBot retry"
- Aurora ReviewBot
On April 16, 2016, 4:10 p.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 16, 2016, 4:10 p.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by John Sirois <js...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/
-----------------------------------------------------------
(Updated April 16, 2016, 10:10 a.m.)
Review request for Aurora, Bill Farner and Zameer Manji.
Changes
-------
Add a release note highlighting `-zk_use_curator`.
Also kill a now-dead inner-class from `legacy_untested_classes.txt`.
RELEASE-NOTES.md | 10 +++++++++-
config/legacy_untested_classes.txt | 1 -
2 files changed, 9 insertions(+), 2 deletions(-)
Bugs: AURORA-1468
https://issues.apache.org/jira/browse/AURORA-1468
Repository: aurora
Description
-------
This Adds a Guice module for the Curator discovery implementations and
re-works the `ServiceDiscoveryModule` to optionally bind it when the new
`-zk_use_curator` flag is set.
config/legacy_untested_classes.txt | 6 +-
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
17 files changed, 605 insertions(+), 263 deletions(-)
Diffs (updated)
-----
RELEASE-NOTES.md a0536ec352119952d4d58aa5f36e5e9a7b7d2e6e
config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
Diff: https://reviews.apache.org/r/46286/diff/
Testing
-------
Locally green:
```
./gradlew -Pq build
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
```
Also, `./gradle run` succeeds in propping up a local scheduler that works.
The e2e is also green under Curator with the edit:
```diff
diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
index b9732d2..084016a 100644
--- a/examples/vagrant/upstart/aurora-scheduler.conf
+++ b/examples/vagrant/upstart/aurora-scheduler.conf
@@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
-native_log_quorum_size=1 \
+ -zk_use_curator \
-zk_endpoints=localhost:2181 \
```
I left things as-is for this RB though.
Thanks,
John Sirois
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by John Sirois <js...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/#review129219
-----------------------------------------------------------
NB: Diff 2 does switch to Curator for both SchedulerIT and e2e since the CuratorFramework.start ordering instability (yes - I was hiding this!), is solved.
- John Sirois
On April 15, 2016, 5:54 p.m., John Sirois wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/46286/
> -----------------------------------------------------------
>
> (Updated April 15, 2016, 5:54 p.m.)
>
>
> Review request for Aurora, Bill Farner and Zameer Manji.
>
>
> Bugs: AURORA-1468
> https://issues.apache.org/jira/browse/AURORA-1468
>
>
> Repository: aurora
>
>
> Description
> -------
>
> This Adds a Guice module for the Curator discovery implementations and
> re-works the `ServiceDiscoveryModule` to optionally bind it when the new
> `-zk_use_curator` flag is set.
>
> config/legacy_untested_classes.txt | 6 +-
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
> src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
> src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
> 17 files changed, 605 insertions(+), 263 deletions(-)
>
>
> Diffs
> -----
>
> config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
> examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
> src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
> src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
> src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
> src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
> src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
> src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
> src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
> src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
> src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
>
> Diff: https://reviews.apache.org/r/46286/diff/
>
>
> Testing
> -------
>
> Locally green:
> ```
> ./gradlew -Pq build
> ./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
> ```
>
> Also, `./gradle run` succeeds in propping up a local scheduler that works.
>
> The e2e is also green under Curator with the edit:
> ```diff
> diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
> index b9732d2..084016a 100644
> --- a/examples/vagrant/upstart/aurora-scheduler.conf
> +++ b/examples/vagrant/upstart/aurora-scheduler.conf
> @@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
> -native_log_quorum_size=1 \
> + -zk_use_curator \
> -zk_endpoints=localhost:2181 \
> ```
>
> I left things as-is for this RB though.
>
>
> Thanks,
>
> John Sirois
>
>
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by John Sirois <js...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/
-----------------------------------------------------------
(Updated April 15, 2016, 5:54 p.m.)
Review request for Aurora, Bill Farner and Zameer Manji.
Changes
-------
Fix CuratorFramework.start ordering instability.
examples/vagrant/upstart/aurora-scheduler.conf | 1 +
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 44 +++++++++++++++++---------------------------
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 2 +-
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 10 +++++++++-
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 10 ++++++++++
5 files changed, 38 insertions(+), 29 deletions(-)
Bugs: AURORA-1468
https://issues.apache.org/jira/browse/AURORA-1468
Repository: aurora
Description
-------
This Adds a Guice module for the Curator discovery implementations and
re-works the `ServiceDiscoveryModule` to optionally bind it when the new
`-zk_use_curator` flag is set.
config/legacy_untested_classes.txt | 6 +-
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
17 files changed, 605 insertions(+), 263 deletions(-)
Diffs (updated)
-----
config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
examples/vagrant/upstart/aurora-scheduler.conf b9732d28f447ce4ab8bb820820d958582744d193
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
Diff: https://reviews.apache.org/r/46286/diff/
Testing
-------
Locally green:
```
./gradlew -Pq build
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
```
Also, `./gradle run` succeeds in propping up a local scheduler that works.
The e2e is also green under Curator with the edit:
```diff
diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
index b9732d2..084016a 100644
--- a/examples/vagrant/upstart/aurora-scheduler.conf
+++ b/examples/vagrant/upstart/aurora-scheduler.conf
@@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
-native_log_quorum_size=1 \
+ -zk_use_curator \
-zk_endpoints=localhost:2181 \
```
I left things as-is for this RB though.
Thanks,
John Sirois
Re: Review Request 46286: Plumb Curator discovery as an option.
Posted by John Sirois <js...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/46286/
-----------------------------------------------------------
(Updated April 15, 2016, 5:13 p.m.)
Review request for Aurora, Bill Farner and Zameer Manji.
Bugs: AURORA-1468
https://issues.apache.org/jira/browse/AURORA-1468
Repository: aurora
Description
-------
This Adds a Guice module for the Curator discovery implementations and
re-works the `ServiceDiscoveryModule` to optionally bind it when the new
`-zk_use_curator` flag is set.
config/legacy_untested_classes.txt | 6 +-
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java | 6 +-
src/main/java/org/apache/aurora/scheduler/discovery/{ServiceDiscoveryModule.java => CommonsServiceDiscoveryModule.java} | 52 ++++++++-------
src/main/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitor.java => CommonsServiceGroupMonitor.java} | 4 +-
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java | 6 ++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java | 59 ++++++++++++++++
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java | 150 ++++++++++++++++++++++++++++-------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java | 144 ---------------------------------------
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java | 44 ++++++++++--
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java | 14 ++--
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java | 13 ++--
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java | 69 +++++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java | 29 ++++++++
src/test/java/org/apache/aurora/scheduler/discovery/{CommonsServerGroupMonitorTest.java => CommonsServiceGroupMonitorTest.java} | 10 +--
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java | 57 ++++++++++++++++
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java | 23 ++++---
17 files changed, 605 insertions(+), 263 deletions(-)
Diffs
-----
config/legacy_untested_classes.txt 30875daf27c03ec7c52080a8cada310e85dd93b5
src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java 25e1312bc8539a7c44be5b764acef3b791b93f82
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitor.java 3336c87f9e261dbafda7b1da9d8c4d92c794d3d8
src/main/java/org/apache/aurora/scheduler/discovery/CommonsServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/CuratorServiceDiscoveryModule.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/FlaggedZooKeeperConfig.java c3a524f86229aaf51312c21932583538fbe5fc8d
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryBindings.java PRE-CREATION
src/main/java/org/apache/aurora/scheduler/discovery/ServiceDiscoveryModule.java fa605cc6c5832b9eec4930191404c674731fd80c
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperClientModule.java c0f2061ca3ba371935b6e4555705607c13116713
src/main/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfig.java 80f4da4167a64d0493ce4683260d31e37a9cb803
src/main/java/org/apache/aurora/scheduler/log/mesos/MesosLogStreamModule.java 2aa31ee74e3995d41f02baf2255c0be375982cb9
src/test/java/org/apache/aurora/scheduler/app/SchedulerIT.java b83815b53531dca7752424de7be08142065273e0
src/test/java/org/apache/aurora/scheduler/discovery/AbstractDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/CommonsServerGroupMonitorTest.java b5847801e764602af05799d96f49dbabb46620a5
src/test/java/org/apache/aurora/scheduler/discovery/CuratorDiscoveryModuleTest.java PRE-CREATION
src/test/java/org/apache/aurora/scheduler/discovery/ZooKeeperConfigTest.java ac781ea2037b370d8892015b4e5224b2e43f796a
Diff: https://reviews.apache.org/r/46286/diff/
Testing (updated)
-------
Locally green:
```
./gradlew -Pq build
./src/test/sh/org/apache/aurora/e2e/test_end_to_end.sh
```
Also, `./gradle run` succeeds in propping up a local scheduler that works.
The e2e is also green under Curator with the edit:
```diff
diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
index b9732d2..084016a 100644
--- a/examples/vagrant/upstart/aurora-scheduler.conf
+++ b/examples/vagrant/upstart/aurora-scheduler.conf
@@ -35,2 +35,3 @@ exec bin/aurora-scheduler \
-native_log_quorum_size=1 \
+ -zk_use_curator \
-zk_endpoints=localhost:2181 \
```
I left things as-is for this RB though.
Thanks,
John Sirois