forked from apache/geode
-
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.
GEODE-4192 GetServer request should return error if no servers found
I modified the GetServerOperationHandler to return a failure if there are no suitable servers. There is a new NO_AVAILABLE_SERVER error code for this. I altered the test for this condition to require an error response. I altered the experimental driver to look for the new error code and added tests in DriverConnectionTest to ensure that it's working.
- Loading branch information
1 parent
1f4c907
commit a675572
Showing
7 changed files
with
131 additions
and
24 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
101 changes: 101 additions & 0 deletions
101
...ental-driver/src/test/java/org/apache/geode/experimental/driver/DriverConnectionTest.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,101 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more contributor license | ||
| * agreements. See the NOTICE file distributed with this work for additional information regarding | ||
| * copyright ownership. The ASF 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 org.apache.geode.experimental.driver; | ||
|
|
||
| import static org.apache.geode.internal.Assert.assertTrue; | ||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNull; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Properties; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.contrib.java.lang.system.RestoreSystemProperties; | ||
| import org.junit.experimental.categories.Category; | ||
|
|
||
| import org.apache.geode.cache.Cache; | ||
| import org.apache.geode.cache.CacheFactory; | ||
| import org.apache.geode.cache.RegionShortcut; | ||
| import org.apache.geode.cache.server.CacheServer; | ||
| import org.apache.geode.distributed.ConfigurationProperties; | ||
| import org.apache.geode.distributed.Locator; | ||
| import org.apache.geode.pdx.PdxInstance; | ||
| import org.apache.geode.test.junit.categories.IntegrationTest; | ||
|
|
||
| @Category(IntegrationTest.class) | ||
| public class DriverConnectionTest { | ||
| @Rule | ||
| public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); | ||
|
|
||
| /** a JSON document */ | ||
| private static final String jsonDocument = | ||
| "{" + System.lineSeparator() + " \"name\" : \"Charlemagne\"," + System.lineSeparator() | ||
| + " \"age\" : 1276," + System.lineSeparator() + " \"nationality\" : \"french\"," | ||
| + System.lineSeparator() + " \"emailAddress\" : \"none\"" + System.lineSeparator() + "}"; | ||
|
|
||
|
|
||
| private Locator locator; | ||
| private Cache cache; | ||
| private Driver driver; | ||
| private int locatorPort; | ||
|
|
||
| @Before | ||
| public void createServerAndDriver() throws Exception { | ||
| System.setProperty("geode.feature-protobuf-protocol", "true"); | ||
|
|
||
| // Create a cache | ||
| CacheFactory cf = new CacheFactory(); | ||
| cf.set(ConfigurationProperties.MCAST_PORT, "0"); | ||
| cache = cf.create(); | ||
|
|
||
| // Start a locator | ||
| locator = Locator.startLocatorAndDS(0, null, new Properties()); | ||
| locatorPort = locator.getPort(); | ||
|
|
||
| // do not start a cache server | ||
| } | ||
|
|
||
| @After | ||
| public void cleanup() { | ||
| locator.stop(); | ||
| cache.close(); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| @Test | ||
| public void driverFailsToConnectWhenThereAreNoServers() throws Exception { | ||
| try { | ||
| driver = new DriverFactory().addLocator("localhost", locatorPort).create(); | ||
| } catch (IOException e) { | ||
| // success | ||
| return; | ||
| } | ||
| throw new AssertionError("expected an IOException"); | ||
| } | ||
|
|
||
| @Test | ||
| public void driverCanConnectWhenThereAreServers() throws Exception { | ||
| CacheServer server = cache.addCacheServer(); | ||
| server.setPort(0); | ||
| server.start(); | ||
| driver = new DriverFactory().addLocator("localhost", locatorPort).create(); | ||
| } | ||
|
|
||
| } |
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