Author: orudyy
Date: Thu Apr 23 12:09:06 2015
New Revision: 1675579
URL: http://svn.apache.org/r1675579
Log:
QPID-6503: Replace BrokerShutdownProvider functionality with closing of system
config on startup if Broker state is ERRORED
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerShutdownProvider.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
qpid/java/trunk/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfigImpl.java
Thu Apr 23 12:09:06 2015
@@ -27,7 +27,6 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.AbstractSystemConfig;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.SystemConfigFactoryConstructor;
@@ -50,10 +49,9 @@ public class BDBSystemConfigImpl extends
public BDBSystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final Map<String,Object> attributes,
- final BrokerShutdownProvider
brokerShutdownProvider)
+ final Map<String,Object> attributes)
{
- super(taskExecutor, eventLogger, logRecorder, attributes,
brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes);
}
@Override
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
Thu Apr 23 12:09:06 2015
@@ -1198,7 +1198,7 @@ public class BDBHAVirtualHostNodeImpl ex
finally
{
_systemConfig.getEventLogger().message(BrokerMessages.FATAL_ERROR(e.getMessage()));
- _systemConfig.getBrokerShutdownProvider().shutdown(1);
+ _systemConfig.closeAsync();
}
}
}
Modified:
qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java
(original)
+++
qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/SystemConfigFactoryGenerator.java
Thu Apr 23 12:09:06 2015
@@ -118,7 +118,6 @@ public class SystemConfigFactoryGenerato
pw.println("import
org.apache.qpid.server.configuration.updater.TaskExecutor;");
pw.println("import org.apache.qpid.server.logging.EventLogger;");
pw.println("import org.apache.qpid.server.logging.LogRecorder;");
- pw.println("import
org.apache.qpid.server.model.BrokerShutdownProvider;");
pw.println("import
org.apache.qpid.server.model.ConfiguredObjectTypeRegistry;");
pw.println("import org.apache.qpid.server.model.SystemConfig;");
pw.println("import
org.apache.qpid.server.plugin.PluggableService;");
@@ -141,10 +140,9 @@ public class SystemConfigFactoryGenerato
pw.println(" public "+objectSimpleName+" newInstance(final
TaskExecutor taskExecutor,");
pw.println(" final EventLogger
eventLogger,");
pw.println(" final LogRecorder
logRecorder,");
- pw.println(" final Map<String,Object>
attributes,");
- pw.println(" final BrokerShutdownProvider
brokerShutdownProvider)");
+ pw.println(" final Map<String,Object>
attributes)");
pw.println(" {");
- pw.println(" return new "+objectSimpleName+"(taskExecutor,
eventLogger, logRecorder, attributes, brokerShutdownProvider);");
+ pw.println(" return new "+objectSimpleName+"(taskExecutor,
eventLogger, logRecorder, attributes);");
pw.println(" }");
pw.println("}");
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/Broker.java
Thu Apr 23 12:09:06 2015
@@ -30,8 +30,6 @@ import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -53,14 +51,14 @@ import org.apache.qpid.server.logging.Me
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.log4j.LoggingManagementFacade;
import org.apache.qpid.server.logging.messages.BrokerMessages;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
+import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.plugin.PluggableFactoryLoader;
import org.apache.qpid.server.plugin.SystemConfigFactory;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.util.Action;
-public class Broker implements BrokerShutdownProvider
+public class Broker
{
private static final Logger LOGGER = Logger.getLogger(Broker.class);
@@ -99,8 +97,7 @@ public class Broker implements BrokerShu
shutdown(0);
}
- @Override
- public void shutdown(final int exitStatusCode)
+ public void shutdown(int exitStatusCode)
{
try
{
@@ -108,60 +105,27 @@ public class Broker implements BrokerShu
}
finally
{
- if(_systemConfig != null)
+ try
{
- final ListenableFuture<Void> closeResult =
_systemConfig.closeAsync();
- if (_taskExecutor.isTaskExecutorThread())
- {
- //spawn a new thread to avoid blocking the shutdown
- final ExecutorService executor =
Executors.newSingleThreadExecutor();
- executor.execute(new Runnable()
- {
- @Override
- public void run()
- {
- try
- {
- waitAndFinishShutdown(closeResult,
exitStatusCode);
- }
- finally
- {
- executor.shutdown();
- }
- }
- });
- }
- else
+ if(_systemConfig != null)
{
- waitAndFinishShutdown(closeResult, exitStatusCode);
+ ListenableFuture<Void> closeResult =
_systemConfig.closeAsync();
+ closeResult.get(30000l, TimeUnit.MILLISECONDS);
}
+
}
- else
+ catch (TimeoutException | InterruptedException |
ExecutionException e)
{
-
- finishShutdown(exitStatusCode);
+ LOGGER.warn("Attempting to cleanly shutdown took too long,
exiting immediately");
+ }
+ finally
+ {
+ cleanUp(exitStatusCode);
}
}
}
- private void waitAndFinishShutdown(ListenableFuture<Void> closeResult, int
exitStatusCode)
- {
- try
- {
- closeResult.get(30000l, TimeUnit.MILLISECONDS);
-
- }
- catch (TimeoutException | InterruptedException | ExecutionException e)
- {
- LOGGER.warn("Attempting to cleanly shutdown took too long, exiting
immediately");
- }
- finally
- {
- finishShutdown(exitStatusCode);
- }
- }
-
- private void finishShutdown(int exitStatusCode)
+ private void cleanUp(int exitStatusCode)
{
_taskExecutor.stop();
@@ -174,6 +138,8 @@ public class Broker implements BrokerShu
{
_shutdownAction.performAction(exitStatusCode);
}
+
+ _systemConfig = null;
}
public void startup() throws Exception
@@ -190,7 +156,6 @@ public class Broker implements BrokerShu
@Override
public Object run() throws Exception
{
- addShutdownHook();
startupImpl(options);
return null;
}
@@ -242,27 +207,45 @@ public class Broker implements BrokerShu
LogRecorder logRecorder = new LogRecorder();
_taskExecutor.start();
- _systemConfig = configFactory.newInstance(_taskExecutor, _eventLogger,
logRecorder, options.convertToSystemConfigAttributes(), this);
+ _systemConfig = configFactory.newInstance(_taskExecutor, _eventLogger,
logRecorder, options.convertToSystemConfigAttributes());
try
{
_systemConfig.open();
- }
- catch(RuntimeException e)
- {
- LOGGER.fatal("Exception during startup", e);
- try
+ if (_systemConfig.getBroker().getState() == State.ERRORED)
{
- _systemConfig.close();
+ LOGGER.warn("Closing broker as it cannot operate due to
errors");
+ closeSystemConfig();
}
- catch(Exception ce)
+ else
{
- LOGGER.debug("An error occurred when closing the registry
following initialization failure", ce);
+ addShutdownHook();
}
+ }
+ catch(RuntimeException e)
+ {
+ LOGGER.fatal("Exception during startup", e);
+ closeSystemConfig();
throw e;
}
}
+ private void closeSystemConfig()
+ {
+ try
+ {
+ _systemConfig.close();
+ }
+ catch(Exception ce)
+ {
+ LOGGER.debug("An error occurred when closing the system config
following initialization failure", ce);
+ }
+ finally
+ {
+ cleanUp(1);
+ }
+ }
+
private void configureLogging(File logConfigFile, int logWatchTime,
boolean startupLoggedToSystemOutput) throws InitException, IOException
{
_configuringOwnLogging = true;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
Thu Apr 23 12:09:06 2015
@@ -56,7 +56,6 @@ public abstract class AbstractSystemConf
private static final UUID SYSTEM_ID = new UUID(0l, 0l);
private final EventLogger _eventLogger;
private final LogRecorder _logRecorder;
- private final BrokerShutdownProvider _brokerShutdownProvider;
private DurableConfigurationStore _configurationStore;
@@ -88,8 +87,7 @@ public abstract class AbstractSystemConf
public AbstractSystemConfig(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final Map<String,Object> attributes,
- final BrokerShutdownProvider
brokerShutdownProvider)
+ final Map<String,Object> attributes)
{
super(parentsMap(),
updateAttributes(attributes),
@@ -97,7 +95,6 @@ public abstract class AbstractSystemConf
_eventLogger = eventLogger;
getTaskExecutor().start();
_logRecorder = logRecorder;
- _brokerShutdownProvider = brokerShutdownProvider;
}
private static Map<String, Object> updateAttributes(Map<String, Object>
attributes)
@@ -354,12 +351,6 @@ public abstract class AbstractSystemConf
}
@Override
- public BrokerShutdownProvider getBrokerShutdownProvider()
- {
- return _brokerShutdownProvider;
- }
-
- @Override
public boolean isStartupLoggedToSystemOut()
{
return _startupLoggedToSystemOut;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/JsonSystemConfigImpl.java
Thu Apr 23 12:09:06 2015
@@ -39,10 +39,9 @@ public class JsonSystemConfigImpl extend
public JsonSystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final Map<String,Object> attributes,
- final BrokerShutdownProvider
brokerShutdownProvider)
+ final Map<String,Object> attributes)
{
- super(taskExecutor, eventLogger, logRecorder, attributes,
brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes);
}
public String getStorePath()
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
Thu Apr 23 12:09:06 2015
@@ -73,6 +73,4 @@ public interface SystemConfig<X extends
DurableConfigurationStore getConfigurationStore();
- BrokerShutdownProvider getBrokerShutdownProvider();
-
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Thu Apr 23 12:09:06 2015
@@ -640,24 +640,7 @@ public class BrokerAdapter extends Abstr
@Override
protected void onExceptionInOpen(RuntimeException e)
{
- SystemConfig systemConfig = getParent(SystemConfig.class);
- if (systemConfig != null)
- {
- BrokerShutdownProvider shutdownProvider =
systemConfig.getBrokerShutdownProvider();
- if (shutdownProvider != null)
- {
-
_eventLogger.message(BrokerMessages.FATAL_ERROR(e.getMessage()));
- shutdownProvider.shutdown(1);
- }
- else
- {
- throw new IllegalStateException("Shutdown provider is not
found in system config");
- }
- }
- else
- {
- throw new IllegalStateException("SystemConfig is not found among
broker parents");
- }
+ _eventLogger.message(BrokerMessages.FATAL_ERROR(e.getMessage()));
}
public void registerMessageDelivered(long messageSize)
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/plugin/SystemConfigFactory.java
Thu Apr 23 12:09:06 2015
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.SystemConfig;
public interface SystemConfigFactory<X extends SystemConfig<X>> extends
Pluggable
@@ -33,6 +32,5 @@ public interface SystemConfigFactory<X e
public X newInstance(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final Map<String,Object> options,
- final BrokerShutdownProvider brokerShutdownProvider);
+ final Map<String,Object> options);
}
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
Thu Apr 23 12:09:06 2015
@@ -46,7 +46,6 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.AbstractSystemConfig;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.JsonSystemConfigImpl;
import org.apache.qpid.server.model.Port;
@@ -81,8 +80,7 @@ public class ManagementModeStoreHandlerT
_taskExecutor.start();
_systemConfig = new JsonSystemConfigImpl(_taskExecutor,
mock(EventLogger.class),
- mock(LogRecorder.class), new
BrokerOptions().convertToSystemConfigAttributes(),
-
mock(BrokerShutdownProvider.class));
+ mock(LogRecorder.class), new
BrokerOptions().convertToSystemConfigAttributes());
ConfiguredObjectRecord systemContextRecord =
_systemConfig.asObjectRecord();
@@ -128,8 +126,7 @@ public class ManagementModeStoreHandlerT
_systemConfig = new AbstractSystemConfig(_taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- attributes,
-
mock(BrokerShutdownProvider.class))
+ attributes)
{
@Override
protected void onOpen()
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
Thu Apr 23 12:09:06 2015
@@ -21,9 +21,7 @@
package org.apache.qpid.server.store;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.verify;
import java.util.Arrays;
import java.util.Collections;
@@ -41,11 +39,11 @@ import org.apache.qpid.server.logging.Lo
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.GroupProvider;
import org.apache.qpid.server.model.JsonSystemConfigImpl;
import org.apache.qpid.server.model.Port;
+import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.SystemConfig;
public class BrokerRecovererTest extends TestCase
@@ -57,7 +55,6 @@ public class BrokerRecovererTest extends
private UUID _authenticationProvider1Id = UUID.randomUUID();
private SystemConfig<?> _systemConfig;
private TaskExecutor _taskExecutor;
- private BrokerShutdownProvider _brokerShutdownProvider;
@Override
protected void setUp() throws Exception
@@ -66,11 +63,9 @@ public class BrokerRecovererTest extends
_taskExecutor = new CurrentThreadTaskExecutor();
_taskExecutor.start();
- _brokerShutdownProvider = mock(BrokerShutdownProvider.class);
_systemConfig = new JsonSystemConfigImpl(_taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- new
BrokerOptions().convertToSystemConfigAttributes(),
- _brokerShutdownProvider);
+ new
BrokerOptions().convertToSystemConfigAttributes());
when(_brokerEntry.getId()).thenReturn(_brokerId);
when(_brokerEntry.getType()).thenReturn(Broker.class.getSimpleName());
@@ -260,7 +255,7 @@ public class BrokerRecovererTest extends
resolveObjects(_brokerEntry);
Broker<?> broker = _systemConfig.getBroker();
broker.open();
- verify(_brokerShutdownProvider).shutdown(1);
+ assertEquals("Unexpected broker state", State.ERRORED,
broker.getState());
}
}
@@ -279,7 +274,7 @@ public class BrokerRecovererTest extends
Broker<?> broker = (Broker<?>) recover.resolve();
broker.open();
- verify(_brokerShutdownProvider).shutdown(1);
+ assertEquals("Unexpected broker state", State.ERRORED,
broker.getState());
}
public void testIncorrectModelVersion() throws Exception
@@ -297,8 +292,7 @@ public class BrokerRecovererTest extends
_systemConfig.getObjectFactory().recover(_brokerEntry,
_systemConfig);
Broker<?> broker = (Broker<?>) recover.resolve();
broker.open();
- verify(_brokerShutdownProvider).shutdown(1);
- reset(_brokerShutdownProvider);
+ assertEquals("Unexpected broker state", State.ERRORED,
broker.getState());
}
}
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
Thu Apr 23 12:09:06 2015
@@ -35,7 +35,6 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.BrokerModel;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.JsonSystemConfigImpl;
import org.apache.qpid.server.model.SystemConfig;
@@ -81,8 +80,7 @@ public class BrokerStoreUpgraderAndRecov
_systemConfig = new JsonSystemConfigImpl(_taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- new
BrokerOptions().convertToSystemConfigAttributes(),
-
mock(BrokerShutdownProvider.class));
+ new
BrokerOptions().convertToSystemConfigAttributes());
}
public void testUpgradeVirtualHostWithJDBCStoreAndBoneCPPool()
Modified:
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
(original)
+++
qpid/java/trunk/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbySystemConfigImpl.java
Thu Apr 23 12:09:06 2015
@@ -27,7 +27,6 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.AbstractSystemConfig;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.SystemConfigFactoryConstructor;
@@ -49,10 +48,9 @@ public class DerbySystemConfigImpl exten
public DerbySystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final Map<String,Object> attributes,
- final BrokerShutdownProvider
brokerShutdownProvider)
+ final Map<String,Object> attributes)
{
- super(taskExecutor, eventLogger, logRecorder, attributes,
brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes);
}
@Override
Modified:
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
(original)
+++
qpid/java/trunk/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/store/jdbc/JDBCSystemConfigImpl.java
Thu Apr 23 12:09:06 2015
@@ -27,7 +27,6 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.AbstractSystemConfig;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.SystemConfigFactoryConstructor;
@@ -51,10 +50,9 @@ public class JDBCSystemConfigImpl extend
public JDBCSystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final Map<String,Object> attributes,
- final BrokerShutdownProvider
brokerShutdownProvider)
+ final Map<String,Object> attributes)
{
- super(taskExecutor, eventLogger, logRecorder, attributes,
brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes);
}
@Override
Modified:
qpid/java/trunk/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java
(original)
+++
qpid/java/trunk/broker-plugins/memory-store/src/main/java/org/apache/qpid/server/store/MemorySystemConfigImpl.java
Thu Apr 23 12:09:06 2015
@@ -27,7 +27,6 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.AbstractSystemConfig;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerShutdownProvider;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.SystemConfigFactoryConstructor;
@@ -41,10 +40,9 @@ public class MemorySystemConfigImpl exte
public MemorySystemConfigImpl(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final LogRecorder logRecorder,
- final Map<String,Object> attributes,
- final BrokerShutdownProvider
brokerShutdownProvider)
+ final Map<String,Object> attributes)
{
- super(taskExecutor, eventLogger, logRecorder, attributes,
brokerShutdownProvider);
+ super(taskExecutor, eventLogger, logRecorder, attributes);
}
@Override
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1675579&r1=1675578&r2=1675579&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Thu Apr 23 12:09:06 2015
@@ -91,8 +91,7 @@ public class TestBrokerConfiguration
final AbstractSystemConfig parentObject = new
JsonSystemConfigImpl(taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
-
brokerOptions.convertToSystemConfigAttributes(),
-
mock(BrokerShutdownProvider.class));
+
brokerOptions.convertToSystemConfigAttributes());
ConfiguredObjectRecordConverter converter = new
ConfiguredObjectRecordConverter(BrokerModel.getInstance());
@@ -205,8 +204,7 @@ public class TestBrokerConfiguration
final SystemConfig parentObject =
configFactory.newInstance(_taskExecutor,
mock(EventLogger.class),
mock(LogRecorder.class),
- attributes,
-
mock(BrokerShutdownProvider.class));
+ attributes);
parentObject.open();
DurableConfigurationStore configurationStore =
parentObject.getConfigurationStore();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
