From 93d1bac140e9a25385b337c7935f73310e65ce9b Mon Sep 17 00:00:00 2001
From: Michael Peter Christen <mc@yacy.net>
Date: Tue, 16 Jul 2013 17:16:48 +0200
Subject: [PATCH] do a more frequent optimization, reduces IO after
 optimization

---
 build.properties                        | 2 +-
 source/net/yacy/search/Switchboard.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.properties b/build.properties
index 11cad1296..5c3684da8 100644
--- a/build.properties
+++ b/build.properties
@@ -3,7 +3,7 @@ javacSource=1.6
 javacTarget=1.6
 
 # Release Configuration
-releaseVersion=1.51
+releaseVersion=1.52
 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 sourceReleaseFile=yacy_src_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 releaseFileParentDir=yacy
diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index 75b87be38..d7c481ac0 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -2291,7 +2291,7 @@ public final class Switchboard extends serverSwitch {
                 long idleSearch = System.currentTimeMillis() - this.localSearchLastAccess;
                 long idleAdmin  = System.currentTimeMillis() - this.adminAuthenticationLastAccess;
                 long deltaOptimize = System.currentTimeMillis() - this.optimizeLastRun;
-                boolean optimizeRequired = deltaOptimize > 60000 * 60 * 6; // 6 hours
+                boolean optimizeRequired = deltaOptimize > 60000 * 60 * 3; // 3 hours
                 log.info("Solr auto-optimization: idleSearch=" + idleSearch + ", idleAdmin=" + idleAdmin + ", deltaOptimize=" + deltaOptimize + ", proccount=" + proccount);
                 if (idleAdmin > 600000) {
                     // only run optimization if the admin is idle (10 minutes)
@@ -2300,7 +2300,7 @@ public final class Switchboard extends serverSwitch {
                         index.fulltext().optimize(8);
                     }
                     if (optimizeRequired) {
-                        int opts = idleSearch > 600000 ? 1 : 5;
+                        int opts = idleSearch > 600000 ? 1 : 5; // > 10 minutes idle time will cause a full optimization, otherwise a 5-segment optimization
                         log.info("Solr auto-optimization: running solr.optimize(" + opts + ")");
                         index.fulltext().optimize(opts);
                         this.optimizeLastRun = System.currentTimeMillis();