From 6e1f99bd7922b1f8e7136ebeb03c9b9cd2620471 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 17 Sep 2010 22:46:18 +0000
Subject: [PATCH] Refactor configuration of maximum persistent search resource limits
---
opendj-sdk/opends/src/server/org/opends/server/extensions/ParallelWorkQueue.java | 41 -----------------------------------------
1 files changed, 0 insertions(+), 41 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/ParallelWorkQueue.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/ParallelWorkQueue.java
index 2273dcd..a910bef 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/ParallelWorkQueue.java
@@ -104,9 +104,6 @@
// a configuration change has not been completely applied).
private int numWorkerThreads;
- // The number of maximum allowed persistent searches.
- private int maxPSearches;
-
// The queue that will be used to actually hold the pending operations.
private ConcurrentLinkedQueue<AbstractOperation> opQueue;
@@ -145,17 +142,6 @@
// Get the necessary configuration from the provided entry.
numWorkerThreads = getNumWorkerThreads(configuration);
- //Check the value of the maximum persistent searches attribute.
- //We don't allow a value greater than the number of threads.
- maxPSearches = configuration.getMaxPsearches()==null?
- numWorkerThreads:configuration.getMaxPsearches();
- if(maxPSearches > numWorkerThreads)
- {
- Message message = ERR_CONFIG_CORE_INVALID_MAX_PSEARCH_LIMIT.get(
- maxPSearches, numWorkerThreads, numWorkerThreads);
- throw new ConfigException(message);
- }
-
// Create the actual work queue.
opQueue = new ConcurrentLinkedQueue<AbstractOperation>();
@@ -512,19 +498,6 @@
ParallelWorkQueueCfg configuration,
List<Message> unacceptableReasons)
{
- //Check if the max persistent search value is under limit.
- if(configuration.getMaxPsearches() !=null)
- {
- int nPSearches = configuration.getMaxPsearches();
- int nWorkerThreads = getNumWorkerThreads(configuration);
- if(nPSearches > nWorkerThreads)
- {
- Message message = ERR_CONFIG_CORE_INVALID_MAX_PSEARCH_LIMIT.get(
- nPSearches, nWorkerThreads, nWorkerThreads);
- unacceptableReasons.add(message);
- return false;
- }
- }
return true;
}
@@ -576,10 +549,6 @@
}
}
}
- //Get the new maximum psearch value.
- maxPSearches = configuration.getMaxPsearches()==null?
- numWorkerThreads:configuration.getMaxPsearches();
-
return new ConfigChangeResult(ResultCode.SUCCESS, false, resultMessages);
}
@@ -611,16 +580,6 @@
- /**
- * {@inheritDoc}
- */
- public int getMaxPersistentSearchLimit()
- {
- return maxPSearches;
- }
-
-
-
// Determine the number of worker threads.
private int getNumWorkerThreads(ParallelWorkQueueCfg configuration)
{
--
Gitblit v1.10.0