Author: orudyy Date: Thu Oct 2 16:17:51 2014 New Revision: 1629011 URL: http://svn.apache.org/r1629011 Log: QPID-6126: Add checks to allow operations with configured objects in ERRORED state
Modified: qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java Modified: qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java?rev=1629011&r1=1629010&r2=1629011&view=diff ============================================================================== --- qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java (original) +++ qpid/trunk/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java Thu Oct 2 16:17:51 2014 @@ -27,6 +27,7 @@ import org.apache.qpid.server.jmx.MBeanP import org.apache.qpid.server.jmx.ManagedObject; import org.apache.qpid.server.jmx.ManagedObjectRegistry; import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.State; import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; @@ -46,7 +47,7 @@ public class BDBHAMessageStoreManagerMBe @Override public boolean isChildManageableByMBean(ConfiguredObject child) { - return child instanceof BDBHAVirtualHostNode; + return child instanceof BDBHAVirtualHostNode && ((BDBHAVirtualHostNode)child).getState() != State.ERRORED; } @Override Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java?rev=1629011&r1=1629010&r2=1629011&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java (original) +++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java Thu Oct 2 16:17:51 2014 @@ -113,20 +113,12 @@ public class FileSystemPreferencesProvid } @Override - protected void onCreate() - { - super.validateOnCreate(); - File storeFile = new File(_path); - if (!storeFile.exists() ) - { - new FileSystemPreferencesStore(storeFile).createIfNotExist(); - } - } - - @Override protected void onOpen() { FileSystemPreferencesStore store = new FileSystemPreferencesStore(new File(_path)); + + // we need to check and create file if it does not exist every time on open + store.createIfNotExist(); store.open(); _store = store; _open = true; Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1629011&r1=1629010&r2=1629011&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original) +++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Thu Oct 2 16:17:51 2014 @@ -699,11 +699,11 @@ public abstract class AbstractVirtualHos { _logger.error("Failed to close message store", e); } - } - if (!(_virtualHostNode.getConfigurationStore() instanceof MessageStoreProvider)) - { - getEventLogger().message(getMessageStoreLogSubject(), MessageStoreMessages.CLOSED()); + if (!(_virtualHostNode.getConfigurationStore() instanceof MessageStoreProvider)) + { + getEventLogger().message(getMessageStoreLogSubject(), MessageStoreMessages.CLOSED()); + } } } Modified: qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java?rev=1629011&r1=1629010&r2=1629011&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java (original) +++ qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java Thu Oct 2 16:17:51 2014 @@ -176,7 +176,11 @@ public abstract class AbstractVirtualHos deleteVirtualHostIfExists(); close(); deleted(); - getConfigurationStore().onDelete(this); + DurableConfigurationStore configurationStore = getConfigurationStore(); + if (configurationStore != null) + { + configurationStore.onDelete(this); + } } protected void deleteVirtualHostIfExists() @@ -211,6 +215,7 @@ public abstract class AbstractVirtualHos @Override protected void postResolve() { + super.postResolve(); DurableConfigurationStore store = getConfigurationStore(); if (store == null) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org