-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* allow JsonConfigTesterBase to treat the fields of collections * [Feature] Exhibitor Support (#3664) This patch provides the integration of Druid & Netflix Exhibitor. Druid currently use Apache Curator as ZooKeeper client. Curator can be integrated with Exhibitor to achieve a live/updating list of the ZooKeeper ensemble. This patch enables Druid to use this features.
- Loading branch information
Showing
7 changed files
with
516 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
server/src/main/java/io/druid/curator/ExhibitorConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Licensed to Metamarkets Group Inc. (Metamarkets) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Metamarkets licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package io.druid.curator; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import javax.validation.constraints.Max; | ||
| import javax.validation.constraints.Min; | ||
|
|
||
| /** | ||
| */ | ||
| public class ExhibitorConfig | ||
| { | ||
| @JsonProperty | ||
| private List<String> hosts = new ArrayList<>(); | ||
|
|
||
| @JsonProperty("port") | ||
| @Min(0) | ||
| @Max(0xffff) | ||
| private int restPort = 8080; | ||
|
|
||
| @JsonProperty | ||
| private String restUriPath = "/exhibitor/v1/cluster/list"; | ||
|
|
||
| @JsonProperty | ||
| private boolean useSsl = false; | ||
|
|
||
| @JsonProperty | ||
| @Min(0) | ||
| private int pollingMs = 10000; | ||
|
|
||
| public List<String> getHosts() | ||
| { | ||
| return hosts; | ||
| } | ||
|
|
||
| public int getRestPort() | ||
| { | ||
| return restPort; | ||
| } | ||
|
|
||
| public String getRestUriPath() | ||
| { | ||
| return restUriPath; | ||
| } | ||
|
|
||
| public boolean getUseSsl() | ||
| { | ||
| return useSsl; | ||
| } | ||
|
|
||
| public int getPollingMs() | ||
| { | ||
| return pollingMs; | ||
| } | ||
|
|
||
| } |
139 changes: 139 additions & 0 deletions
139
server/src/test/java/io/druid/curator/CuratorModuleTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| * Licensed to Metamarkets Group Inc. (Metamarkets) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Metamarkets licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package io.druid.curator; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.inject.Binder; | ||
| import com.google.inject.Guice; | ||
| import com.google.inject.Injector; | ||
| import com.google.inject.Module; | ||
| import com.google.inject.util.Modules; | ||
|
|
||
| import org.apache.curator.ensemble.EnsembleProvider; | ||
| import org.apache.curator.ensemble.exhibitor.ExhibitorEnsembleProvider; | ||
| import org.apache.curator.ensemble.fixed.FixedEnsembleProvider; | ||
| import org.apache.curator.framework.CuratorFramework; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Properties; | ||
|
|
||
| import io.druid.guice.GuiceInjectors; | ||
| import io.druid.guice.LifecycleModule; | ||
|
|
||
| /** | ||
| */ | ||
| public final class CuratorModuleTest | ||
| { | ||
|
|
||
| private static final String curatorHostKey = CuratorModule.CURATOR_CONFIG_PREFIX + ".host"; | ||
|
|
||
| private static final String exhibitorHostsKey = CuratorModule.EXHIBITOR_CONFIG_PREFIX + ".hosts"; | ||
|
|
||
| @Test | ||
| public void defaultEnsembleProvider() throws NoSuchFieldException, IllegalAccessException | ||
| { | ||
| Injector injector = newInjector(new Properties()); | ||
| injector.getInstance(CuratorFramework.class); // initialize related components | ||
| EnsembleProvider ensembleProvider = injector.getInstance(EnsembleProvider.class); | ||
| Assert.assertTrue( | ||
| "EnsembleProvider should be FixedEnsembleProvider", | ||
| ensembleProvider instanceof FixedEnsembleProvider | ||
| ); | ||
| Assert.assertEquals( | ||
| "The connectionString should be 'localhost'", | ||
| "localhost", ensembleProvider.getConnectionString() | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void fixedZkHosts() | ||
| { | ||
| Properties props = new Properties(); | ||
| props.put(curatorHostKey, "hostA"); | ||
| Injector injector = newInjector(props); | ||
|
|
||
| injector.getInstance(CuratorFramework.class); // initialize related components | ||
| EnsembleProvider ensembleProvider = injector.getInstance(EnsembleProvider.class); | ||
| Assert.assertTrue( | ||
| "EnsembleProvider should be FixedEnsembleProvider", | ||
| ensembleProvider instanceof FixedEnsembleProvider | ||
| ); | ||
| Assert.assertEquals( | ||
| "The connectionString should be 'hostA'", | ||
| "hostA", ensembleProvider.getConnectionString() | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void exhibitorEnsembleProvider() | ||
| { | ||
| Properties props = new Properties(); | ||
| props.put(curatorHostKey, "hostA"); | ||
| props.put(exhibitorHostsKey, "[\"hostB\"]"); | ||
| Injector injector = newInjector(props); | ||
|
|
||
| injector.getInstance(CuratorFramework.class); // initialize related components | ||
| EnsembleProvider ensembleProvider = injector.getInstance(EnsembleProvider.class); | ||
| Assert.assertTrue( | ||
| "EnsembleProvider should be ExhibitorEnsembleProvider", | ||
| ensembleProvider instanceof ExhibitorEnsembleProvider | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void emptyExhibitorHosts() | ||
| { | ||
| Properties props = new Properties(); | ||
| props.put(curatorHostKey, "hostB"); | ||
| props.put(exhibitorHostsKey, "[]"); | ||
| Injector injector = newInjector(props); | ||
|
|
||
| injector.getInstance(CuratorFramework.class); // initialize related components | ||
| EnsembleProvider ensembleProvider = injector.getInstance(EnsembleProvider.class); | ||
| Assert.assertTrue( | ||
| "EnsembleProvider should be FixedEnsembleProvider", | ||
| ensembleProvider instanceof FixedEnsembleProvider | ||
| ); | ||
| Assert.assertEquals( | ||
| "The connectionString should be 'hostB'", | ||
| "hostB", ensembleProvider.getConnectionString() | ||
| ); | ||
| } | ||
|
|
||
| private Injector newInjector(final Properties props) | ||
| { | ||
| List<Module> modules = ImmutableList.<Module>builder() | ||
| .addAll(GuiceInjectors.makeDefaultStartupModules()) | ||
| .add(new LifecycleModule()).add(new CuratorModule()).build(); | ||
| return Guice.createInjector( | ||
| Modules.override(modules).with(new Module() | ||
| { | ||
| @Override | ||
| public void configure(Binder binder) | ||
| { | ||
| binder.bind(Properties.class).toInstance(props); | ||
| } | ||
| }) | ||
| ); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.