Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

METRON-2262: Upgrade to Curator 4.2.0 #1516

Open
wants to merge 5 commits into
base: feature/METRON-2088-support-hdp-3.1
Choose a base branch
from
Open

METRON-2262: Upgrade to Curator 4.2.0 #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
afb0d04
METRON-2261 Isolate Curator Dependencies
nickwallen Sep 17, 2019
c4761b1
initial commit
merrimanr Sep 19, 2019
1402365
Merge remote-tracking branch 'mirror/feature/METRON-2088-support-hdp-…
merrimanr Sep 20, 2019
f7ba725
reverted poms
merrimanr Sep 20, 2019
94a3a40
bad merge
merrimanr Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .../metron-maas-common/src/main/java/org/apache/metron/maas/discovery/ServiceDiscoverer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public void unregisterByContainer(String containerIdRaw) {
//}
ServiceInstance<ModelEndpoint> ep = containerToEndpoint.get(containerId);
if(ep != null) {
serviceDiscovery.registerService(ep);
serviceDiscovery.unregisterService(ep);
}
else {
Expand Down
1 change: 0 additions & 1 deletion ...rvice/src/main/java/org/apache/metron/maas/service/callback/ContainerRequestListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ public void onContainersCompleted(List<ContainerStatus> completedContainers) {
+ containerStatus.getDiagnostics());
removeContainer(containerStatus.getContainerId());
LOG.info("REMOVING CONTAINER " + containerStatus.getContainerId());
serviceDiscoverer.unregisterByContainer(containerStatus.getContainerId() + "");
// non complete containers should not be here
assert (containerStatus.getState() == ContainerState.COMPLETE);
// increment counters for completed/failed containers
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@
<!-- For Zookeeper/Curator version compatibility see
http://curator.apache.org/zk-compatibility.html -->
<global_zookeeper_version>3.4.6</global_zookeeper_version>
<global_curator_version>2.7.1</global_curator_version>
<global_curator_test_version>2.7.1</global_curator_test_version>
<global_curator_version>4.2.0</global_curator_version>
<global_curator_test_version>2.12.0</global_curator_test_version>
</properties>
</profile>
<profile>
Expand Down