-
Notifications
You must be signed in to change notification settings - Fork 133
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 #507 from soul2zimate/EJBCLIENT-397-4.0
Ejbclient 397 4.0
- Loading branch information
Showing
3 changed files
with
216 additions
and
8 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
168 changes: 168 additions & 0 deletions
168
src/test/java/org/jboss/ejb/client/test/byteman/TimeoutRetryTestCase.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,168 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2017 Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. | ||
| * | ||
| * 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.jboss.ejb.client.test.byteman; | ||
|
|
||
| import org.jboss.byteman.contrib.bmunit.BMScript; | ||
| import org.jboss.byteman.contrib.bmunit.BMUnitRunner; | ||
| import org.jboss.ejb.client.EJBClient; | ||
| import org.jboss.ejb.client.StatelessEJBLocator; | ||
| import org.jboss.ejb.client.URIAffinity; | ||
| import org.jboss.ejb.client.legacy.JBossEJBProperties; | ||
| import org.jboss.ejb.client.test.ClassCallback; | ||
| import org.jboss.ejb.client.test.common.DummyServer; | ||
| import org.jboss.ejb.client.test.common.Echo; | ||
| import org.jboss.ejb.client.test.common.EchoBean; | ||
| import org.jboss.logging.Logger; | ||
| import org.junit.After; | ||
| import org.junit.AfterClass; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import javax.ejb.EJBException; | ||
| import javax.ejb.NoSuchEJBException; | ||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.TimeoutException; | ||
|
|
||
| /** | ||
| * Tests that a hang does not happen if timeout happens concurrently with retry | ||
| */ | ||
| @RunWith(BMUnitRunner.class) | ||
| @BMScript(dir = "src/test/resources") | ||
| public class TimeoutRetryTestCase { | ||
|
|
||
| private static final Logger logger = Logger.getLogger(TimeoutRetryTestCase.class); | ||
| private static final String PROPERTIES_FILE = "jboss-ejb-client.properties"; | ||
|
|
||
| private DummyServer server; | ||
| private boolean serverStarted = false; | ||
|
|
||
| // module | ||
| private static final String APP_NAME = "my-foo-app"; | ||
| private static final String MODULE_NAME = "my-bar-module"; | ||
| private static final String DISTINCT_NAME = ""; | ||
|
|
||
| private static final String SERVER_NAME = "test-server"; | ||
|
|
||
|
|
||
| /** | ||
| * Do any general setup here | ||
| * | ||
| * @throws Exception | ||
| */ | ||
| @BeforeClass | ||
| public static void beforeClass() throws Exception { | ||
| // trigger the static init of the correct proeprties file - this also depends on running in forkMode=always | ||
| JBossEJBProperties ejbProperties = JBossEJBProperties.fromClassPath(TimeoutRetryTestCase.class.getClassLoader(), PROPERTIES_FILE); | ||
| JBossEJBProperties.getContextManager().setGlobalDefault(ejbProperties); | ||
|
|
||
| // Launch callback if needed | ||
| ClassCallback.beforeClassCallback(); | ||
| } | ||
|
|
||
| /** | ||
| * Do any test specific setup here | ||
| */ | ||
| @Before | ||
| public void beforeTest() throws Exception { | ||
| // start a server | ||
| server = new DummyServer("localhost", 6999, SERVER_NAME); | ||
| server.start(); | ||
| serverStarted = true; | ||
| logger.info("Started server ..."); | ||
|
|
||
| server.register(APP_NAME, MODULE_NAME, DISTINCT_NAME, "missing", new EchoBean()); | ||
| logger.info("Registered module ..."); | ||
| } | ||
|
|
||
| /** | ||
| * Test a basic invocation | ||
| */ | ||
| @Test | ||
| public void testInvocationWithURIAffinity() { | ||
| logger.info("Testing invocation on proxy with URIAffinity"); | ||
|
|
||
| // create a proxy for invocation | ||
| final StatelessEJBLocator<Echo> statelessEJBLocator = new StatelessEJBLocator<Echo>(Echo.class, APP_NAME, MODULE_NAME, Echo.class.getSimpleName(), DISTINCT_NAME); | ||
| final Echo proxy = EJBClient.createProxy(statelessEJBLocator); | ||
| EJBClient.setInvocationTimeout(proxy, 1, TimeUnit.SECONDS); | ||
| URI uri = null; | ||
| try { | ||
| uri = new URI("remote", null, "localhost", 6999, null, null, null); | ||
| } catch (URISyntaxException use) { | ||
| // | ||
| } | ||
| EJBClient.setStrongAffinity(proxy, URIAffinity.forUri(uri)); | ||
| Assert.assertNotNull("Received a null proxy", proxy); | ||
| logger.info("Created proxy for Echo: " + proxy.toString()); | ||
|
|
||
| logger.info("Invoking on proxy..."); | ||
| final String message = "hello!"; | ||
| long start = System.currentTimeMillis(); | ||
| try { | ||
| proxy.echo(message); | ||
| Assert.fail("Invocation expected to fail"); | ||
| } catch (NoSuchEJBException expected) { | ||
| boolean found = false; | ||
| for (Throwable i : expected.getSuppressed()) { | ||
| if (i instanceof TimeoutException) { | ||
| found = true; | ||
| break; | ||
| } | ||
| } | ||
| if (!found) { | ||
| Assert.fail("Expected a supressed timeout exception"); | ||
| } | ||
| expected.printStackTrace(); | ||
| } | ||
| //we have a 3s sleep in the retry code | ||
| //and a 1s timeout | ||
| //so we verify it was less than 1s | ||
| Assert.assertTrue("Invocation should have timed out after 1s", System.currentTimeMillis() - start < 2000); | ||
| } | ||
|
|
||
| /** | ||
| * Do any test-specific tear down here. | ||
| */ | ||
| @After | ||
| public void afterTest() { | ||
| server.unregister(APP_NAME, MODULE_NAME, DISTINCT_NAME, Echo.class.getName()); | ||
| logger.info("Unregistered module ..."); | ||
|
|
||
| if (serverStarted) { | ||
| try { | ||
| this.server.stop(); | ||
| } catch (Throwable t) { | ||
| logger.info("Could not stop server", t); | ||
| } | ||
| } | ||
| logger.info("Stopped server ..."); | ||
| } | ||
|
|
||
| /** | ||
| * Do any general tear down here. | ||
| */ | ||
| @AfterClass | ||
| public static void afterClass() { | ||
| } | ||
|
|
||
| } |
25 changes: 25 additions & 0 deletions
25
src/test/resources/org/jboss/ejb/client/test/byteman/TimeoutRetryTestCase.btm
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,25 @@ | ||
| # | ||
| # JBoss, Home of Professional Open Source. | ||
| # Copyright 2019 Red Hat, Inc., and individual contributors | ||
| # as indicated by the @author tags. | ||
| # | ||
| # 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. | ||
| # | ||
| RULE @1 delay innvocation | ||
| CLASS org.jboss.ejb.client.EJBClientInvocationContext | ||
| AT ENTRY | ||
| METHOD retryOperation | ||
| IF TRUE | ||
| DO | ||
| Thread.sleep(3000) | ||
| ENDRULE |