added more logging for merge operation

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6095 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/kelondro/blob/ArrayStack.java

@@ -702,7 +702,10 @@ public class ArrayStack implements BLOB {
     public File mergeMount(File f1, File f2, ReferenceFactory<? extends Reference> factory, Row payloadrow, File newFile, int writeBuffer) throws IOException {
         Log.logInfo("BLOBArray", "merging " + f1.getName() + " with " + f2.getName());
         File resultFile = mergeWorker(factory, this.keylength, this.ordering, f1, f2, payloadrow, newFile, writeBuffer);
-        if (resultFile == null) return null;
+        if (resultFile == null) {
+            Log.logWarning("BLOBArray", "merge of files " + f1 + ", " + f2 + " returned null. newFile = " + newFile);
+            return null;
+        }
         mountBLOB(resultFile, false);
         Log.logInfo("BLOBArray", "merged " + f1.getName() + " with " + f2.getName() + " into " + resultFile);
         return resultFile;
@@ -740,6 +743,7 @@ public class ArrayStack implements BLOB {
             FileUtils.deletedelete(f2);
             return newFile;
         } catch (IOException e) {
+            Log.logSevere("ArrayStack", "cannot close writing: " + e.getMessage(), e);
             FileUtils.deletedelete(tmpFile);
             FileUtils.deletedelete(newFile);
             e.printStackTrace();

source/de/anomic/kelondro/text/IODispatcher.java

@@ -105,7 +105,7 @@ public class IODispatcher extends Thread {
                 Log.logWarning("IODispatcher", "emergency merge of files " + f1.getName() + ", " + f2.getName() + " to " + newFile.getName());
                 array.mergeMount(f1, f2, factory, payloadrow, newFile, (int) Math.min(MemoryControl.available() / 3, writeBufferSize));
             } catch (IOException e) {
-                e.printStackTrace();
+                Log.logSevere("IODispatcher", "emergency merge failed: " + e.getMessage(), e);
             }
         } else {
             MergeJob job = new MergeJob(f1, f2, factory, array, payloadrow, newFile);
@@ -114,11 +114,11 @@ public class IODispatcher extends Thread {
                 this.controlQueue.release();
                 Log.logInfo("IODispatcher", "appended merge job of files " + f1.getName() + ", " + f2.getName() + " to " + newFile.getName());
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                Log.logWarning("IODispatcher", "interrupted: " + e.getMessage(), e);
                 try {
                     array.mergeMount(f1, f2, factory, payloadrow, newFile, (int) Math.min(MemoryControl.available() / 3, writeBufferSize));
                 } catch (IOException ee) {
-                    ee.printStackTrace();
+                    Log.logSevere("IODispatcher", "IO failed: " + e.getMessage(), e);
                 }
             }
         }
@@ -245,7 +245,7 @@ public class IODispatcher extends Thread {
             try {
                 return array.mergeMount(f1, f2, factory, payloadrow, newFile, (int) Math.min(MemoryControl.available() / 3, writeBufferSize));
             } catch (IOException e) {
-                e.printStackTrace();
+                Log.logSevere("IODispatcher", "mergeMount failed: " + e.getMessage(), e);
             }
             return null;
         }