Review Request 46286: Plumb Curator discovery as an option.

[John Sirois]

-----------------------------------------------------------
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