X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FClusterManager.java;h=4c8df933777742532fcbf598f386362b81adafb5;hb=04a7cb7f4ec34ddd4747723fd51ea22edd5ede0b;hp=40c5de37e8c1991e6e5ce846e2b90e7b651b6c5e;hpb=4cfeb52c28469fdfb6d8b07bac43394bac684e7f;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
index 40c5de37e..4c8df9337 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/ClusterManager.java
@@ -2,7 +2,6 @@ package org.simantics.acorn;
 
 import java.io.IOException;
 import java.math.BigInteger;
-import java.nio.file.CopyOption;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -24,7 +23,6 @@ import org.simantics.acorn.lru.ClusterLRU;
 import org.simantics.acorn.lru.ClusterStreamChunk;
 import org.simantics.acorn.lru.FileInfo;
 import org.simantics.acorn.lru.LRU;
-import org.simantics.databoard.file.RuntimeIOException;
 import org.simantics.db.ClusterCreator;
 import org.simantics.db.Database.Session.ClusterIds;
 import org.simantics.db.Database.Session.ResourceSegment;
@@ -265,11 +263,11 @@ public class ClusterManager {
     		// Nothing has been written => no need to do anything
     		long amountOfFiles = countFiles(workingDirectory);
     		if(!fullSave && amountOfFiles == 0) {
-    //		    System.err.println("amountOfFiles < 3");
+        		//LOGGER.info("makeSnapshot: " + amountOfFiles + " files, skipping snapshot");
     		    return false;
     		}
     
-    		LOGGER.info("makeSnapshot");
+    		LOGGER.info("makeSnapshot: start with " + amountOfFiles + " files");
     
     		// Schedule writing of all data to disk
             refreshHeadState();
@@ -289,13 +287,11 @@ public class ClusterManager {
 
     		persistHeadState();
 
-    		if (fullSave)
-    		    mainState.save(dbFolder);
-    
-    		amountOfFiles = countFiles(workingDirectory);
-    		
-    		LOGGER.info(" -finished: amount of files is {}", amountOfFiles);
-    
+    		if (LOGGER.isInfoEnabled()) {
+    			amountOfFiles = countFiles(workingDirectory);
+    			LOGGER.info(" -finished: amount of files is {}", amountOfFiles);
+    		}
+
     		workingDirectory = dbFolder.resolve(Integer.toString(mainState.headDir));
     		if (!Files.exists(workingDirectory)) {
     		    Files.createDirectories(workingDirectory);
@@ -405,7 +401,7 @@ public class ClusterManager {
 	public void load() throws IOException {
 
 		// Main state
-		mainState = MainState.load(dbFolder, t -> rollback.set(true));
+		mainState = MainState.load(dbFolder, () -> rollback.set(true));
 
 		lastSessionDirectory = dbFolder.resolve(Integer.toString(mainState.headDir - 1));