You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/04 13:50:03 UTC
svn commit: r1768033 - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/virtualhost/
broker-core/src/main...
Author: rgodfrey
Date: Fri Nov 4 13:50:02 2016
New Revision: 1768033
URL: http://svn.apache.org/viewvc?rev=1768033&view=rev
Log:
QPID-7496 : Move more methods to QueueManagingVirtualHost interface
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java?rev=1768033&r1=1768032&r2=1768033&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHostImpl.java Fri Nov 4 13:50:02 2016
@@ -36,13 +36,11 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Connection;
-import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.port.AmqpPort;
-import org.apache.qpid.server.model.preferences.UserPreferences;
import org.apache.qpid.server.protocol.LinkRegistry;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.transport.AMQPConnection;
@@ -59,9 +57,6 @@ public class BDBHAReplicaVirtualHostImpl
private final Broker<?> _broker;
private final VirtualHostPrincipal _principal;
- @ManagedAttributeField
- private List<String> _globalAddressDomains;
-
@ManagedObjectFactoryConstructor(conditionallyAvailable = true, condition = "org.apache.qpid.server.JECheck#isAvailable()")
public BDBHAReplicaVirtualHostImpl(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
{
@@ -166,24 +161,6 @@ public class BDBHAReplicaVirtualHostImpl
}
@Override
- public void setTargetSize(final long targetSize)
- {
-
- }
-
- @Override
- public long getTargetSize()
- {
- return 0l;
- }
-
- @Override
- public long getTotalQueueDepthBytes()
- {
- return 0l;
- }
-
- @Override
public DtxRegistry getDtxRegistry()
{
return null;
@@ -210,7 +187,7 @@ public class BDBHAReplicaVirtualHostImpl
@Override
public List<String> getGlobalAddressDomains()
{
- return _globalAddressDomains;
+ return Collections.emptyList();
}
@Override
@@ -237,10 +214,4 @@ public class BDBHAReplicaVirtualHostImpl
+ " does not permit this operation.");
}
- @Override
- public UserPreferences createUserPreferences(final ConfiguredObject<?> object)
- {
- throwUnsupportedForReplica();
- return null;
- }
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java?rev=1768033&r1=1768032&r2=1768033&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java Fri Nov 4 13:50:02 2016
@@ -82,6 +82,7 @@ import org.apache.qpid.server.store.pref
import org.apache.qpid.server.store.preferences.PreferencesRecoverer;
import org.apache.qpid.server.store.preferences.PreferencesRoot;
import org.apache.qpid.server.util.HousekeepingExecutor;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.VirtualHostPropertiesNodeCreator;
import org.apache.qpid.util.SystemUtils;
@@ -499,14 +500,15 @@ public class BrokerImpl extends Abstract
LOGGER.debug("Assigning target sizes based on total target {}", totalTarget);
long totalSize = 0l;
Collection<VirtualHostNode<?>> vhns = getVirtualHostNodes();
- Map<VirtualHost<?>, Long> vhs = new HashMap<>();
+ Map<QueueManagingVirtualHost<?>, Long> vhs = new HashMap<>();
for (VirtualHostNode<?> vhn : vhns)
{
VirtualHost<?> vh = vhn.getVirtualHost();
- if (vh != null)
+ if (vh instanceof QueueManagingVirtualHost)
{
- long totalQueueDepthBytes = vh.getTotalQueueDepthBytes();
- vhs.put(vh, totalQueueDepthBytes);
+ QueueManagingVirtualHost<?> host = (QueueManagingVirtualHost<?>)vh;
+ long totalQueueDepthBytes = host.getTotalQueueDepthBytes();
+ vhs.put(host, totalQueueDepthBytes);
totalSize += totalQueueDepthBytes;
}
}
@@ -525,7 +527,7 @@ public class BrokerImpl extends Abstract
}
final long proportionalShare = (long) ((double) totalTarget / (double) vhs.size());
- for (Map.Entry<VirtualHost<?>, Long> entry : vhs.entrySet())
+ for (Map.Entry<QueueManagingVirtualHost<?>, Long> entry : vhs.entrySet())
{
long virtualHostTotalQueueSize = entry.getValue();
final long size;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1768033&r1=1768032&r2=1768033&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Fri Nov 4 13:50:02 2016
@@ -20,16 +20,12 @@
*/
package org.apache.qpid.server.model;
-import java.util.List;
-
import org.apache.qpid.server.logging.EventLoggerProvider;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.preferences.UserPreferencesCreator;
@ManagedObject( defaultType = "ProvidedStore", description = VirtualHost.CLASS_DESCRIPTION)
public interface VirtualHost<X extends VirtualHost<X>> extends ConfiguredObject<X>,
- EventLoggerProvider, NamedAddressSpace,
- UserPreferencesCreator
+ EventLoggerProvider, NamedAddressSpace
{
String CLASS_DESCRIPTION = "<p>A virtualhost is a namespace in which messaging is performed. Virtualhosts are "
+ "independent; the messaging goes on a within a virtualhost is independent of any "
@@ -51,16 +47,8 @@ public interface VirtualHost<X extends V
- @ManagedAttribute( defaultValue = "[]")
- List<String> getGlobalAddressDomains();
-
Broker<?> getBroker();
MessageStore getMessageStore();
- void setTargetSize(long targetSize);
- long getTargetSize();
-
- long getTotalQueueDepthBytes();
-
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java?rev=1768033&r1=1768032&r2=1768033&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/QueueManagingVirtualHost.java Fri Nov 4 13:50:02 2016
@@ -46,10 +46,12 @@ import org.apache.qpid.server.queue.Queu
import org.apache.qpid.server.stats.StatisticsGatherer;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.EventListener;
+import org.apache.qpid.server.store.preferences.UserPreferencesCreator;
public interface QueueManagingVirtualHost<X extends QueueManagingVirtualHost<X>> extends VirtualHost<X>,
EventListener,
- StatisticsGatherer
+ StatisticsGatherer,
+ UserPreferencesCreator
{
String HOUSEKEEPING_CHECK_PERIOD = "housekeepingCheckPeriod";
String STORE_TRANSACTION_IDLE_TIMEOUT_CLOSE = "storeTransactionIdleTimeoutClose";
@@ -169,6 +171,9 @@ public interface QueueManagingVirtualHos
@ManagedAttribute( defaultValue = "${virtualhost.disabledConnectionValidators}")
List<String> getDisabledConnectionValidators();
+ @ManagedAttribute( defaultValue = "[]")
+ List<String> getGlobalAddressDomains();
+
@ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME, units = StatisticUnit.COUNT, label = "Queues")
long getQueueCount();
@@ -247,6 +252,10 @@ public interface QueueManagingVirtualHos
void setFirstOpening(boolean firstOpening);
+ long getTargetSize();
+ void setTargetSize(long targetSize);
+ long getTotalQueueDepthBytes();
+
interface Transaction
{
void dequeue(QueueEntry entry);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java?rev=1768033&r1=1768032&r2=1768033&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java Fri Nov 4 13:50:02 2016
@@ -38,13 +38,11 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Connection;
-import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.port.AmqpPort;
-import org.apache.qpid.server.model.preferences.UserPreferences;
import org.apache.qpid.server.protocol.LinkRegistry;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.transport.AMQPConnection;
@@ -62,10 +60,6 @@ class RedirectingVirtualHostImpl
private final Broker<?> _broker;
private final VirtualHostPrincipal _principal;
- @ManagedAttributeField
- private List<String> _globalAddressDomains;
-
-
@ManagedObjectFactoryConstructor
public RedirectingVirtualHostImpl(final Map<String, Object> attributes, VirtualHostNode<?> virtualHostNode)
{
@@ -181,25 +175,6 @@ class RedirectingVirtualHostImpl
}
@Override
- public void setTargetSize(final long targetSize)
- {
-
- }
-
- @Override
- public long getTargetSize()
- {
- return 0l;
- }
-
- @Override
- public long getTotalQueueDepthBytes()
- {
- return 0l;
- }
-
-
- @Override
public DtxRegistry getDtxRegistry()
{
return null;
@@ -226,7 +201,7 @@ class RedirectingVirtualHostImpl
@Override
public List<String> getGlobalAddressDomains()
{
- return _globalAddressDomains;
+ return Collections.emptyList();
}
@Override
@@ -253,10 +228,4 @@ class RedirectingVirtualHostImpl
+ " does not permit this operation.");
}
- @Override
- public UserPreferences createUserPreferences(final ConfiguredObject<?> object)
- {
- throwUnsupportedForRedirector();
- return null;
- }
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java?rev=1768033&r1=1768032&r2=1768033&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/BrokerImplTest.java Fri Nov 4 13:50:02 2016
@@ -55,6 +55,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.auth.manager.SimpleAuthenticationManager;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.preferences.PreferenceStore;
+import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
import org.apache.qpid.server.virtualhostnode.TestVirtualHostNode;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -258,9 +259,13 @@ public class BrokerImplTest extends Qpid
long totalAssignedTargetSize = 0;
for(VirtualHostNode<?> vhn : _brokerImpl.getVirtualHostNodes())
{
- long targetSize = vhn.getVirtualHost().getTargetSize();
- assertTrue("A virtualhost's target size cannot be zero", targetSize > 0);
- totalAssignedTargetSize += targetSize;
+ VirtualHost<?> virtualHost = vhn.getVirtualHost();
+ if(virtualHost instanceof QueueManagingVirtualHost)
+ {
+ long targetSize = ((QueueManagingVirtualHost<?>)virtualHost).getTargetSize();
+ assertTrue("A virtualhost's target size cannot be zero", targetSize > 0);
+ totalAssignedTargetSize += targetSize;
+ }
}
long diff = Math.abs(flowToDiskThreshold - totalAssignedTargetSize);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org