forked from JanusGraph/janusgraph
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request JanusGraph#717 from dpitera/sync-graph-instances-716
Sync EvictionTrigger's openInstances on schedule
- Loading branch information
Showing
10 changed files
with
303 additions
and
36 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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -265,6 +265,9 @@ public void read(Message message) { | |
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void updateState() {} | ||
| } | ||
|
|
||
| } | ||
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
109 changes: 109 additions & 0 deletions
109
...h-test/src/main/java/org/janusgraph/graphdb/GraphDatabaseConfigurationInstanceIdTest.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,109 @@ | ||
| // Copyright 2017 JanusGraph Authors | ||
| // | ||
| // Licensed 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 org.janusgraph.graphdb; | ||
|
|
||
| import org.janusgraph.core.JanusGraphException; | ||
| import org.janusgraph.graphdb.database.StandardJanusGraph; | ||
| import org.janusgraph.diskstorage.configuration.backend.CommonsConfiguration; | ||
| import org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration; | ||
| import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.STORAGE_BACKEND; | ||
| import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.UNIQUE_INSTANCE_ID; | ||
| import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.UNIQUE_INSTANCE_ID_HOSTNAME; | ||
| import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.UNIQUE_INSTANCE_ID_SUFFIX; | ||
| import static org.janusgraph.graphdb.configuration.GraphDatabaseConfiguration.REPLACE_INSTANCE_IF_EXISTS; | ||
|
|
||
| import org.apache.commons.configuration.MapConfiguration; | ||
|
|
||
| import java.net.Inet4Address; | ||
| import java.net.UnknownHostException; | ||
| import java.util.Map; | ||
| import java.util.HashMap; | ||
| import org.junit.Test; | ||
| import org.junit.Rule; | ||
| import org.junit.rules.ExpectedException; | ||
| import static org.junit.Assert.*; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class GraphDatabaseConfigurationInstanceIdTest { | ||
|
|
||
| @Rule | ||
| public ExpectedException thrown = ExpectedException.none(); | ||
|
|
||
| @Test | ||
| public void graphShouldOpenWithSameInstanceId() { | ||
| final Map<String, Object> map = new HashMap<String, Object>(); | ||
| map.put(STORAGE_BACKEND.toStringWithoutRoot(), "inmemory"); | ||
| map.put(UNIQUE_INSTANCE_ID.toStringWithoutRoot(), "not-unique"); | ||
| map.put(REPLACE_INSTANCE_IF_EXISTS.toStringWithoutRoot(), true); | ||
| final MapConfiguration config = new MapConfiguration(map); | ||
| final StandardJanusGraph graph1 = new StandardJanusGraph(new GraphDatabaseConfiguration(new CommonsConfiguration(config))); | ||
|
|
||
| assertEquals(graph1.openManagement().getOpenInstances().size(), 1); | ||
| assertEquals(graph1.openManagement().getOpenInstances().toArray()[0], "not-unique"); | ||
|
|
||
| final StandardJanusGraph graph2 = new StandardJanusGraph(new GraphDatabaseConfiguration(new CommonsConfiguration(config))); | ||
|
|
||
| assertEquals(graph1.openManagement().getOpenInstances().size(), 1); | ||
| assertEquals(graph1.openManagement().getOpenInstances().toArray()[0], "not-unique"); | ||
| assertEquals(graph2.openManagement().getOpenInstances().size(), 1); | ||
| assertEquals(graph2.openManagement().getOpenInstances().toArray()[0], "not-unique"); | ||
| graph1.close(); | ||
| graph2.close(); | ||
| } | ||
|
|
||
| @Test | ||
| public void graphShouldNotOpenWithSameInstanceId() { | ||
| final Map<String, Object> map = new HashMap<String, Object>(); | ||
| map.put(STORAGE_BACKEND.toStringWithoutRoot(), "inmemory"); | ||
| map.put(UNIQUE_INSTANCE_ID.toStringWithoutRoot(), "not-unique"); | ||
| final MapConfiguration config = new MapConfiguration(map); | ||
| final StandardJanusGraph graph1 = new StandardJanusGraph(new GraphDatabaseConfiguration(new CommonsConfiguration(config))); | ||
|
|
||
| assertEquals(graph1.openManagement().getOpenInstances().size(), 1); | ||
| assertEquals(graph1.openManagement().getOpenInstances().toArray()[0], "not-unique"); | ||
|
|
||
| thrown.expect(JanusGraphException.class); | ||
| final String err = "A JanusGraph graph with the same instance id [not-unique] is already open. Might required forced shutdown."; | ||
| thrown.expectMessage(equalTo(err)); | ||
| final StandardJanusGraph graph2 = new StandardJanusGraph(new GraphDatabaseConfiguration(new CommonsConfiguration(config))); | ||
|
|
||
| graph1.close(); | ||
| } | ||
|
|
||
| @Test | ||
| public void instanceIdShouldEqualHostname() throws UnknownHostException { | ||
| final Map<String, Object> map = new HashMap<String, Object>(); | ||
| map.put(STORAGE_BACKEND.toStringWithoutRoot(), "inmemory"); | ||
| map.put(UNIQUE_INSTANCE_ID_HOSTNAME.toStringWithoutRoot(), true); | ||
| final MapConfiguration config = new MapConfiguration(map); | ||
| final StandardJanusGraph graph = new StandardJanusGraph(new GraphDatabaseConfiguration(new CommonsConfiguration(config))); | ||
| assertEquals(graph.openManagement().getOpenInstances().size(), 1); | ||
| assertEquals(graph.openManagement().getOpenInstances().toArray()[0], Inet4Address.getLocalHost().getHostName()); | ||
| graph.close(); | ||
| } | ||
|
|
||
| @Test | ||
| public void instanceIdShouldEqualHostnamePlusSuffix() throws UnknownHostException { | ||
| final Map<String, Object> map = new HashMap<String, Object>(); | ||
| map.put(STORAGE_BACKEND.toStringWithoutRoot(), "inmemory"); | ||
| map.put(UNIQUE_INSTANCE_ID_HOSTNAME.toStringWithoutRoot(), true); | ||
| map.put(UNIQUE_INSTANCE_ID_SUFFIX.toStringWithoutRoot(), 1); | ||
| final MapConfiguration config = new MapConfiguration(map); | ||
| final StandardJanusGraph graph = new StandardJanusGraph(new GraphDatabaseConfiguration(new CommonsConfiguration(config))); | ||
| assertEquals(graph.openManagement().getOpenInstances().size(), 1); | ||
| assertEquals(graph.openManagement().getOpenInstances().toArray()[0], Inet4Address.getLocalHost().getHostName() + "1"); | ||
| graph.close(); | ||
| } | ||
| } |
Oops, something went wrong.