From 3d755209dc2cab1dad0cf00843fbd3af009ecf62 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 06 Oct 2015 08:08:53 +0000
Subject: [PATCH] Removed the ParallelTextWriter experiment (never achieved?, never a success?)
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java | 80 ++++------------------------------------
1 files changed, 8 insertions(+), 72 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
index 046bc25..054f21d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -102,10 +102,6 @@
{
currentWriter = ((AsynchronousTextWriter) writer).getWrappedWriter();
}
- else if (writer instanceof ParallelTextWriter)
- {
- currentWriter = ((ParallelTextWriter) writer).getWrappedWriter();
- }
else
{
currentWriter = writer;
@@ -118,67 +114,25 @@
if (config.isAsynchronous())
{
- if (useAsyncWriter(config))
+ if (writer instanceof AsynchronousTextWriter)
{
- if (writer instanceof AsynchronousTextWriter)
+ if (hasAsyncConfigChanged(config))
{
- if (hasAsyncConfigChanged(config))
- {
- // reinstantiate
- final AsynchronousTextWriter previousWriter = (AsynchronousTextWriter) writer;
- writer = newAsyncWriter(mfWriter, config);
- previousWriter.shutdown(false);
- }
- }
- else if (writer instanceof ParallelTextWriter)
- {
- // convert parallel to async
- final ParallelTextWriter previousWriter = (ParallelTextWriter) writer;
+ // reinstantiate
+ final AsynchronousTextWriter previousWriter = (AsynchronousTextWriter) writer;
writer = newAsyncWriter(mfWriter, config);
previousWriter.shutdown(false);
}
- else
- {
- // turn async text writer on
- writer = newAsyncWriter(mfWriter, config);
- }
}
else
{
- if (writer instanceof AsynchronousTextWriter)
- {
- // convert async to parallel
- final AsynchronousTextWriter previousWriter = (AsynchronousTextWriter) writer;
- writer = newParallelWriter(mfWriter, config);
- previousWriter.shutdown(false);
- }
- else if (writer instanceof ParallelTextWriter)
- {
- if (hasParallelConfigChanged(config))
- {
- // reinstantiate
- final ParallelTextWriter previousWriter = (ParallelTextWriter) writer;
- writer = newParallelWriter(mfWriter, config);
- previousWriter.shutdown(false);
- }
- }
- else
- {
- // turn parallel text writer on
- writer = newParallelWriter(mfWriter, config);
- }
+ // turn async text writer on
+ writer = newAsyncWriter(mfWriter, config);
}
}
else
{
- if (writer instanceof ParallelTextWriter)
- {
- // asynchronous is being turned off, remove parallel text writers.
- final ParallelTextWriter previousWriter = (ParallelTextWriter) writer;
- writer = mfWriter;
- previousWriter.shutdown(false);
- }
- else if (writer instanceof AsynchronousTextWriter)
+ if (writer instanceof AsynchronousTextWriter)
{
// asynchronous is being turned off, remove async text writers.
final AsynchronousTextWriter previousWriter = (AsynchronousTextWriter) writer;
@@ -276,14 +230,7 @@
if (cfg.isAsynchronous())
{
- if (useAsyncWriter(cfg))
- {
- this.writer = newAsyncWriter(theWriter, cfg);
- }
- else
- {
- this.writer = newParallelWriter(theWriter, cfg);
- }
+ this.writer = newAsyncWriter(theWriter, cfg);
}
else
{
@@ -311,11 +258,6 @@
cfg.addFileBasedAccessChangeListener(this);
}
- private boolean useAsyncWriter(FileBasedAccessLogPublisherCfg config)
- {
- return config.getQueueSize() > 0;
- }
-
private boolean hasAsyncConfigChanged(FileBasedAccessLogPublisherCfg newConfig)
{
return hasParallelConfigChanged(newConfig) && cfg.getQueueSize() != newConfig.getQueueSize();
@@ -332,12 +274,6 @@
return new AsynchronousTextWriter(name, config.getQueueSize(), config.isAutoFlush(), mfWriter);
}
- private ParallelTextWriter newParallelWriter(MultifileTextWriter mfWriter, FileBasedAccessLogPublisherCfg config)
- {
- String name = "Parallel Text Writer for " + config.dn();
- return new ParallelTextWriter(name, config.isAutoFlush(), mfWriter);
- }
-
@Override
public boolean isConfigurationAcceptable(
final FileBasedAccessLogPublisherCfg configuration,
--
Gitblit v1.10.0