This is an automated email from the ASF dual-hosted git repository. dschneider pushed a commit to branch feature/GEODE-5897 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 28e7f28ac69147beccb80d3ea09a6ed1c74a64f0 Author: Darrel Schneider <[email protected]> AuthorDate: Mon Oct 22 16:51:56 2018 -0700 Verified the bug with new unit test. The problem was caused by exception being caught, logged, and not rethrown. Now the gfsh function will get the thrown exception and pass a failure back to gfsh. For backwards compatibility, the XML parser still logs a warning if the jndi-binding can not be created, instead of having it cause the cache not to start. --- .../CreateJndiBindingCommandDUnitTest.java | 21 ++++++ .../functions/DestroyJndiBindingFunctionTest.java | 2 +- .../cli/functions/ListJndiBindingFunctionTest.java | 2 +- .../internal/cache/xmlcache/CacheXmlParser.java | 12 +++- .../apache/geode/internal/jndi/JNDIInvoker.java | 82 ++++++++++------------ .../cli/functions/CreateJndiBindingFunction.java | 6 +- .../geode/internal/jndi/JNDIInvokerTest.java | 52 ++++++++++++++ 7 files changed, 126 insertions(+), 51 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java index b498157..7495de1 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandDUnitTest.java @@ -26,8 +26,11 @@ import org.w3c.dom.NodeList; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.internal.jndi.JNDIInvoker; +import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.internal.configuration.domain.Configuration; import org.apache.geode.management.internal.configuration.utils.XmlUtils; +import org.apache.geode.test.dunit.IgnoredException; +import org.apache.geode.test.dunit.SerializableRunnableIF; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; import org.apache.geode.test.junit.rules.GfshCommandRule; @@ -101,5 +104,23 @@ public class CreateJndiBindingCommandDUnitTest { server1.invoke(() -> { assertThat(JNDIInvoker.getNoOfAvailableDataSources()).isEqualTo(1); }); + + verifyThatNonExistentClassCausesGfshToError(); + } + + private void verifyThatNonExistentClassCausesGfshToError() { + SerializableRunnableIF IgnoreClassNotFound = () -> { + IgnoredException ex = + new IgnoredException("non_existent_class_name"); + LogService.getLogger().info(ex.getAddMessage()); + }; + + server1.invoke(IgnoreClassNotFound); + server2.invoke(IgnoreClassNotFound); + + // create the binding + gfsh.executeAndAssertThat( + "create jndi-binding --name=jndiBad --username=myuser --password=mypass --type=SIMPLE --jdbc-driver-class=non_existent_class_name --connection-url=\"jdbc:derby:newDB;create=true\"") + .statusIsError(); } } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java index b354f02..cf9cbbd 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DestroyJndiBindingFunctionTest.java @@ -47,7 +47,7 @@ public class DestroyJndiBindingFunctionTest { private ArgumentCaptor<CliFunctionResult> resultCaptor; @Before - public void setup() { + public void setup() throws Exception { destroyJndiBindingFunction = spy(new DestroyJndiBindingFunction()); context = mock(FunctionContext.class); diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java index a360ebe..4c784bc 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/ListJndiBindingFunctionTest.java @@ -47,7 +47,7 @@ public class ListJndiBindingFunctionTest { private ArgumentCaptor<CliFunctionResult> resultCaptor; @Before - public void setup() { + public void setup() throws Exception { listJndiBindingFunction = spy(new ListJndiBindingFunction()); context = mock(FunctionContext.class); distributedSystem = mock(DistributedSystem.class); diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java index edd9c67..306c35f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java @@ -31,6 +31,7 @@ import java.util.Set; import java.util.Stack; import java.util.StringTokenizer; +import javax.naming.NamingException; import javax.xml.XMLConstants; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -113,6 +114,7 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.PartitionAttributesImpl; import org.apache.geode.internal.cache.PartitionedRegionHelper; import org.apache.geode.internal.datasource.ConfigProperty; +import org.apache.geode.internal.datasource.DataSourceCreateException; import org.apache.geode.internal.jndi.JNDIInvoker; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.logging.log4j.LogMarker; @@ -3028,9 +3030,15 @@ public class CacheXmlParser extends CacheXml implements ContentHandler { endTransactionWriter(); } else if (qName.equals(JNDI_BINDINGS)) { } else if (qName.equals(JNDI_BINDING)) { - // Asif Pop the BindingCreation object BindingCreation bc = (BindingCreation) this.stack.pop(); - JNDIInvoker.mapDatasource(bc.getGFSpecificMap(), bc.getVendorSpecificList()); + Map map = bc.getGFSpecificMap(); + try { + JNDIInvoker.mapDatasource(map, bc.getVendorSpecificList()); + } catch (NamingException | DataSourceCreateException ex) { + if (logger.isWarnEnabled()) { + logger.warn("jndi-binding creation of {} failed with: {}", map.get("jndi-name"), ex); + } + } } else if (qName.equals(CONFIG_PROPERTY_BINDING)) { } else if (qName.equals(CONFIG_PROPERTY_NAME)) { String name = null; diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java index 42f6d8b..6097cc8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java +++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java @@ -326,60 +326,50 @@ public class JNDIInvoker { * * @param map contains Datasource configuration properties. */ - public static void mapDatasource(Map map, List<ConfigProperty> props) { - mapDatasource(map, props, dataSourceFactory); + public static void mapDatasource(Map map, List<ConfigProperty> props) + throws NamingException, DataSourceCreateException { + mapDatasource(map, props, dataSourceFactory, ctx); } static void mapDatasource(Map map, List<ConfigProperty> props, - DataSourceFactory dataSourceFactory) { + DataSourceFactory dataSourceFactory, Context context) + throws NamingException, DataSourceCreateException { String value = (String) map.get("type"); String jndiName = ""; LogWriter writer = TransactionUtils.getLogWriter(); DataSource ds = null; - try { - jndiName = (String) map.get("jndi-name"); - if (value.equals("PooledDataSource")) { - ds = dataSourceFactory.getPooledDataSource(map, props); - ctx.rebind("java:/" + jndiName, ds); - dataSourceMap.put(jndiName, ds); - if (writer.fineEnabled()) - writer.fine("Bound java:/" + jndiName + " to Context"); - } else if (value.equals("XAPooledDataSource")) { - ds = dataSourceFactory.getTranxDataSource(map, props); - ctx.rebind("java:/" + jndiName, ds); - dataSourceMap.put(jndiName, ds); - if (writer.fineEnabled()) - writer.fine("Bound java:/" + jndiName + " to Context"); - } else if (value.equals("SimpleDataSource")) { - ds = dataSourceFactory.getSimpleDataSource(map); - ctx.rebind("java:/" + jndiName, ds); - dataSourceMap.put(jndiName, ds); - if (writer.fineEnabled()) - writer.fine("Bound java:/" + jndiName + " to Context"); - } else if (value.equals("ManagedDataSource")) { - ClientConnectionFactoryWrapper ds1 = dataSourceFactory.getManagedDataSource(map, props); - ctx.rebind("java:/" + jndiName, ds1.getClientConnFactory()); - dataSourceMap.put(jndiName, ds1); - if (writer.fineEnabled()) - writer.fine("Bound java:/" + jndiName + " to Context"); - } else { - String exception = "JNDIInvoker::mapDataSource::No correct type of DataSource"; - if (writer.fineEnabled()) - writer.fine(exception); - throw new DataSourceCreateException(exception); - } - ds = null; - } catch (NamingException ne) { - if (writer.infoEnabled()) - writer.info( - String.format("JNDIInvoker::mapDataSource::%s while binding %s to JNDI Context", - new Object[] {"NamingException", jndiName})); - } catch (DataSourceCreateException dsce) { - if (writer.infoEnabled()) - writer.info( - String.format("JNDIInvoker::mapDataSource::%s while binding %s to JNDI Context", - new Object[] {"DataSourceCreateException", jndiName})); + jndiName = (String) map.get("jndi-name"); + if (value.equals("PooledDataSource")) { + ds = dataSourceFactory.getPooledDataSource(map, props); + context.rebind("java:/" + jndiName, ds); + dataSourceMap.put(jndiName, ds); + if (writer.fineEnabled()) + writer.fine("Bound java:/" + jndiName + " to Context"); + } else if (value.equals("XAPooledDataSource")) { + ds = dataSourceFactory.getTranxDataSource(map, props); + context.rebind("java:/" + jndiName, ds); + dataSourceMap.put(jndiName, ds); + if (writer.fineEnabled()) + writer.fine("Bound java:/" + jndiName + " to Context"); + } else if (value.equals("SimpleDataSource")) { + ds = dataSourceFactory.getSimpleDataSource(map); + context.rebind("java:/" + jndiName, ds); + dataSourceMap.put(jndiName, ds); + if (writer.fineEnabled()) + writer.fine("Bound java:/" + jndiName + " to Context"); + } else if (value.equals("ManagedDataSource")) { + ClientConnectionFactoryWrapper ds1 = dataSourceFactory.getManagedDataSource(map, props); + ctx.rebind("java:/" + jndiName, ds1.getClientConnFactory()); + dataSourceMap.put(jndiName, ds1); + if (writer.fineEnabled()) + writer.fine("Bound java:/" + jndiName + " to Context"); + } else { + String exception = "JNDIInvoker::mapDataSource::No correct type of DataSource"; + if (writer.fineEnabled()) + writer.fine(exception); + throw new DataSourceCreateException(exception); } + ds = null; } public static void unMapDatasource(String jndiName) throws NamingException { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java index 4b9d659..7aa8119 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateJndiBindingFunction.java @@ -19,10 +19,13 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import javax.naming.NamingException; + import org.apache.geode.cache.configuration.JndiBindingsType; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.ResultSender; import org.apache.geode.internal.datasource.ConfigProperty; +import org.apache.geode.internal.datasource.DataSourceCreateException; import org.apache.geode.internal.jndi.JNDIInvoker; import org.apache.geode.management.cli.CliFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; @@ -33,7 +36,8 @@ public class CreateJndiBindingFunction extends CliFunction<JndiBindingsType.Jndi "Initiated jndi binding \"{0}\" on \"{1}\". See server logs to verify."; @Override - public CliFunctionResult executeFunction(FunctionContext<JndiBindingsType.JndiBinding> context) { + public CliFunctionResult executeFunction(FunctionContext<JndiBindingsType.JndiBinding> context) + throws DataSourceCreateException, NamingException { ResultSender<Object> resultSender = context.getResultSender(); JndiBindingsType.JndiBinding configuration = context.getArguments(); JNDIInvoker.mapDatasource(getParamsAsMap(configuration), diff --git a/geode-core/src/test/java/org/apache/geode/internal/jndi/JNDIInvokerTest.java b/geode-core/src/test/java/org/apache/geode/internal/jndi/JNDIInvokerTest.java new file mode 100644 index 0000000..eb9337f --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/jndi/JNDIInvokerTest.java @@ -0,0 +1,52 @@ +/* + * 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.internal.jndi; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowable; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mock; + +import java.util.HashMap; +import java.util.Map; + +import javax.naming.Context; + +import org.junit.Test; + +import org.apache.geode.internal.datasource.DataSourceCreateException; +import org.apache.geode.internal.datasource.DataSourceFactory; + +public class JNDIInvokerTest { + + @Test + public void verifyThatMapDataSourceWithGetSimpleDataSourceThrowingWillThrowThatException() + throws Exception { + Map<String, String> inputs = new HashMap<>(); + Context context = mock(Context.class); + DataSourceFactory dataSourceFactory = mock(DataSourceFactory.class); + DataSourceCreateException exception = mock(DataSourceCreateException.class); + doThrow(exception).when(dataSourceFactory).getSimpleDataSource(any()); + inputs.put("type", "SimpleDataSource"); + + Throwable thrown = + catchThrowable(() -> JNDIInvoker.mapDatasource(inputs, null, dataSourceFactory, context)); + + assertThat(thrown).isSameAs(exception); + } +}
