You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/12/16 14:18:07 UTC
svn commit: r1774599 - in /qpid/java/branches/6.1.x: ./
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-core/src/main/java/org/apache/qpid/server/util/
broker-core/src/main/java/org/apache/qpid/server/virtualhost/
Author: lquack
Date: Fri Dec 16 14:18:06 2016
New Revision: 1774599
URL: http://svn.apache.org/viewvc?rev=1774599&view=rev
Log:
QPID-7560: [Java Broker] Remove duplicate state transition.
Also interpret a negative housekeeping interval as 'disable housekeeping' rather than causing an exception.
merged from trunk with:
$ svn merge -c 1774446 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 16 14:18:06 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772241,1773057,1774039
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772241,1773057,1774039,1774446
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1774599&r1=1774598&r2=1774599&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java Fri Dec 16 14:18:06 2016
@@ -254,7 +254,7 @@ public class FileBasedGroupProviderImpl
{
if (getAncestor(SystemConfig.class).isManagementMode())
{
- LOGGER.warn("Failed to activate group provider: " + getName());
+ LOGGER.warn("Failed to activate group provider: {}", getName());
}
else
{
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java?rev=1774599&r1=1774598&r2=1774599&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/util/HousekeepingExecutor.java Fri Dec 16 14:18:06 2016
@@ -83,7 +83,7 @@ public class HousekeepingExecutor extend
}
if (t != null)
{
- LOGGER.error("Houskeeping task threw an exception:", t);
+ LOGGER.error("Housekeeping task threw an exception:", t);
final Thread.UncaughtExceptionHandler uncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
if (uncaughtExceptionHandler != null)
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1774599&r1=1774598&r2=1774599&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Fri Dec 16 14:18:06 2016
@@ -1123,7 +1123,7 @@ public abstract class AbstractVirtualHos
*/
private void initialiseHouseKeeping(long period)
{
- if (period != 0L)
+ if (period > 0L)
{
scheduleHouseKeepingTask(period, new VirtualHostHouseKeepingTask());
}
@@ -2556,6 +2556,7 @@ public abstract class AbstractVirtualHos
}
// propagate any exception thrown during recovery into HouseKeepingTaskExecutor to handle them accordingly
+ // TODO if message recovery fails we ought to be transitioning the VH into ERROR and releasing the thread-pools etc.
final ListenableFuture<Void> recoveryResult = _messageStoreRecoverer.recover(this);
recoveryResult.addListener(new Runnable()
{
@@ -2582,16 +2583,17 @@ public abstract class AbstractVirtualHos
protected void startFileSystemSpaceChecking()
{
+ long housekeepingCheckPeriod = getHousekeepingCheckPeriod();
File storeLocationAsFile = _messageStore.getStoreLocationAsFile();
- if (storeLocationAsFile != null && _fileSystemMaxUsagePercent > 0)
+ if (storeLocationAsFile != null && _fileSystemMaxUsagePercent > 0 && housekeepingCheckPeriod > 0)
{
_fileSystemSpaceChecker.setFileSystem(storeLocationAsFile);
- scheduleHouseKeepingTask(getHousekeepingCheckPeriod(), _fileSystemSpaceChecker);
+ scheduleHouseKeepingTask(housekeepingCheckPeriod, _fileSystemSpaceChecker);
}
}
- @StateTransition( currentState = { State.STOPPED, State.ERRORED }, desiredState = State.ACTIVE )
+ @StateTransition( currentState = { State.STOPPED }, desiredState = State.ACTIVE )
private ListenableFuture<Void> onRestart()
{
resetStatistics();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org