WAL max size limit was restored. Free space detection bug was fixed. …

…Additional improvements.
sunnybt · Feb 6, 2015 · 253e575 · 253e575
1 parent 42f0cb4
commit 253e575
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 36 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -116,7 +116,7 @@
                 <configuration>
                     <argLine>-ea -Xmx2048m -Dindex.flushAfterCreate=false -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterOpen=false
                         -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false
-                        -Dstorage.configuration.syncOnUpdate=false
+                        -Dstorage.configuration.syncOnUpdate=false -Ddb.makeFullCheckpointOnIndexChange=false -Ddb.makeFullCheckpointOnSchemaChange=false
                     </argLine>
                     <systemPropertyVariables>
                         <buildDirectory>${project.build.directory}</buildDirectory>

diff --git a/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java b/core/src/main/java/com/orientechnologies/orient/core/config/OGlobalConfiguration.java
@@ -461,6 +461,12 @@ public void change(final Object iCurrentValue, final Object iNewValue) {
   DISTRIBUTED_PURGE_RESPONSES_TIMER_DELAY("distributed.purgeResponsesTimerDelay",
       "Maximum timeout in milliseconds to collect all the asynchronous responses from replication", Integer.class, 15000l),
 
+  DB_MAKE_FULL_CHECKPOINT_ON_INDEX_CHANGE("db.makeFullCheckpointOnIndexChange",
+      "When index metadata is changed full checkpoint is performed", Boolean.class, true),
+
+  DB_MAKE_FULL_CHECKPOINT_ON_SCHEMA_CHANGE("db.makeFullCheckpointOnSchemaChange",
+      "When index schema is changed full checkpoint is performed", Boolean.class, true),
+
   DB_DOCUMENT_SERIALIZER("db.document.serializer", "The default record serializer used by the document database", String.class,
       ORecordSerializerBinary.NAME),
 

diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentTx.java b/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentTx.java
@@ -418,8 +418,11 @@ public OSBTreeCollectionManager call() throws Exception {
         // @COMPATIBILITY 1.0RC9
         metadata.getSchema().createClass(OMVRBTreeRIDProvider.PERSISTENT_CLASS_NAME);
 
-      metadata.getSchema().setFullCheckpointOnChange(true);
-      metadata.getIndexManager().setFullCheckpointOnChange(true);
+      if (OGlobalConfiguration.DB_MAKE_FULL_CHECKPOINT_ON_SCHEMA_CHANGE.getValueAsBoolean())
+        metadata.getSchema().setFullCheckpointOnChange(true);
+
+      if (OGlobalConfiguration.DB_MAKE_FULL_CHECKPOINT_ON_INDEX_CHANGE.getValueAsBoolean())
+        metadata.getIndexManager().setFullCheckpointOnChange(true);
       getStorage().synch();
       // WAKE UP DB LIFECYCLE LISTENER
       for (Iterator<ODatabaseLifecycleListener> it = Orient.instance().getDbLifecycleListeners(); it.hasNext();)
@@ -2649,8 +2652,12 @@ public OSBTreeCollectionManager call() throws Exception {
       // @COMPATIBILITY 1.0RC9
       metadata.getSchema().createClass(OMVRBTreeRIDProvider.PERSISTENT_CLASS_NAME);
 
-    metadata.getSchema().setFullCheckpointOnChange(true);
-    metadata.getIndexManager().setFullCheckpointOnChange(true);
+    if (OGlobalConfiguration.DB_MAKE_FULL_CHECKPOINT_ON_SCHEMA_CHANGE.getValueAsBoolean())
+      metadata.getSchema().setFullCheckpointOnChange(true);
+
+    if (OGlobalConfiguration.DB_MAKE_FULL_CHECKPOINT_ON_INDEX_CHANGE.getValueAsBoolean())
+      metadata.getIndexManager().setFullCheckpointOnChange(true);
+
     initialized = true;
   }
 

diff --git a/.../java/com/orientechnologies/orient/core/storage/impl/local/OAbstractPaginatedStorage.java b/.../java/com/orientechnologies/orient/core/storage/impl/local/OAbstractPaginatedStorage.java
@@ -96,6 +96,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
 
 /**
@@ -131,7 +132,8 @@ public abstract class OAbstractPaginatedStorage extends OStorageAbstract impleme
                                                                                                 .getValueAsBoolean();
 
   private volatile OLowDiskSpaceInformation      lowDiskSpace                               = null;
-  private volatile boolean                       fullCheckpointRequest                      = false;
+  private volatile boolean                       checkpointRequest                          = false;
+  private final AtomicBoolean                    checkpointInProgress                       = new AtomicBoolean();
 
   public OAbstractPaginatedStorage(String name, String filePath, String mode) {
     super(name, filePath, mode, OGlobalConfiguration.STORAGE_LOCK_TIMEOUT.getValueAsInteger());
@@ -1152,8 +1154,8 @@ public void lowDiskSpace(OLowDiskSpaceInformation information) {
   }
 
   @Override
-  public void requestFullCheckpoint() {
-    fullCheckpointRequest = true;
+  public void requestCheckpoint() {
+    checkpointRequest = true;
   }
 
   /**
@@ -2565,30 +2567,48 @@ private void checkLowDiskSpaceAndFullCheckpointRequests() {
       return;
 
     if (lowDiskSpace != null) {
-      diskCache.makeFuzzyCheckpoint();
-
-      if (diskCache.checkLowDiskSpace()) {
-        synch();
-        diskCache.makeFuzzyCheckpoint();
-
-        if (diskCache.checkLowDiskSpace()) {
-          throw new OLowDiskSpaceException("Error occurred while executing a write operation to database '" + name
-              + "' due to limited free space on the disk (" + (lowDiskSpace.freeSpace / (1024 * 1024))
-              + " MB). The database is now working in read-only mode."
-              + " Please close the database (or stop OrientDB), make room on your hard drive and then reopen the database. "
-              + "The minimal required space is " + (lowDiskSpace.requiredSpace / (1024 * 1024)) + " MB. "
-              + "Required space is now set to " + OGlobalConfiguration.DISK_CACHE_FREE_SPACE_LIMIT.getValueAsInteger()
-              + "MB (you can change it by setting parameter " + OGlobalConfiguration.DISK_CACHE_FREE_SPACE_LIMIT.getKey() + ") .");
-        } else {
-          lowDiskSpace = null;
+      if (checkpointInProgress.compareAndSet(false, true)) {
+        try {
+          diskCache.makeFuzzyCheckpoint();
+
+          if (diskCache.checkLowDiskSpace()) {
+            synch();
+
+            if (diskCache.checkLowDiskSpace()) {
+              throw new OLowDiskSpaceException("Error occurred while executing a write operation to database '" + name
+                  + "' due to limited free space on the disk (" + (lowDiskSpace.freeSpace / (1024 * 1024))
+                  + " MB). The database is now working in read-only mode."
+                  + " Please close the database (or stop OrientDB), make room on your hard drive and then reopen the database. "
+                  + "The minimal required space is " + (lowDiskSpace.requiredSpace / (1024 * 1024)) + " MB. "
+                  + "Required space is now set to " + OGlobalConfiguration.DISK_CACHE_FREE_SPACE_LIMIT.getValueAsInteger()
+                  + "MB (you can change it by setting parameter " + OGlobalConfiguration.DISK_CACHE_FREE_SPACE_LIMIT.getKey()
+                  + ") .");
+            } else {
+              lowDiskSpace = null;
+            }
+          } else
+            lowDiskSpace = null;
+        } finally {
+          checkpointInProgress.set(false);
         }
-      } else
-        lowDiskSpace = null;
+      }
     }
 
-    if (fullCheckpointRequest) {
-      synch();
-      fullCheckpointRequest = false;
+    if (checkpointRequest && writeAheadLog instanceof ODiskWriteAheadLog) {
+      if (checkpointInProgress.compareAndSet(false, true)) {
+        try {
+          final ODiskWriteAheadLog diskWriteAheadLog = (ODiskWriteAheadLog) writeAheadLog;
+          final long size = diskWriteAheadLog.size();
+
+          diskCache.makeFuzzyCheckpoint();
+          if (size >= diskWriteAheadLog.size())
+            synch();
+
+          checkpointRequest = false;
+        } finally {
+          checkpointInProgress.set(false);
+        }
+      }
     }
   }
 }
diff --git a/.../com/orientechnologies/orient/core/storage/impl/local/OFullCheckpointRequestListener.java b/.../com/orientechnologies/orient/core/storage/impl/local/OFullCheckpointRequestListener.java
@@ -5,5 +5,5 @@
  * @since 05/02/15
  */
 public interface OFullCheckpointRequestListener {
-	void requestFullCheckpoint();
+	void requestCheckpoint();
 }
diff --git a/...om/orientechnologies/orient/core/storage/impl/local/paginated/wal/ODiskWriteAheadLog.java b/...om/orientechnologies/orient/core/storage/impl/local/paginated/wal/ODiskWriteAheadLog.java
@@ -903,7 +903,7 @@ public OLogSequenceNumber log(OWALRecord record) throws IOException {
         for (WeakReference<OFullCheckpointRequestListener> listenerWeakReference : fullCheckpointListeners) {
           final OFullCheckpointRequestListener listener = listenerWeakReference.get();
           if (listener != null)
-            listener.requestFullCheckpoint();
+            listener.requestCheckpoint();
         }
       }
 

diff --git a/distributed/pom.xml b/distributed/pom.xml
@@ -126,7 +126,7 @@
                 <configuration>
                     <argLine>-ea -Xmx2048m -Dindex.flushAfterCreate=false -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterOpen=false
                         -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false
-                        -Dstorage.configuration.syncOnUpdate=false
+                        -Dstorage.configuration.syncOnUpdate=false -Ddb.makeFullCheckpointOnIndexChange=false -Ddb.makeFullCheckpointOnSchemaChange=false
                     </argLine>
                     <systemPropertyVariables>
                         <buildDirectory>${project.build.directory}</buildDirectory>

diff --git a/graphdb/pom.xml b/graphdb/pom.xml
@@ -133,7 +133,7 @@
                         -Dstorage.makeFullCheckpointAfterCreate=false
                         -Dstorage.makeFullCheckpointAfterOpen=false
                         -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false
-                        -Dstorage.configuration.syncOnUpdate=false
+                        -Dstorage.configuration.syncOnUpdate=false -Ddb.makeFullCheckpointOnIndexChange=false -Ddb.makeFullCheckpointOnSchemaChange=false
                     </argLine>
                     <systemPropertyVariables>
                         <buildDirectory>${project.build.directory}</buildDirectory>

diff --git a/object/pom.xml b/object/pom.xml
@@ -97,7 +97,7 @@
                 <configuration>
                     <argLine>-ea -Xmx2048m -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterOpen=false
                         -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false
-                        -Dstorage.configuration.syncOnUpdate=false
+                        -Dstorage.configuration.syncOnUpdate=false -Ddb.makeFullCheckpointOnIndexChange=false -Ddb.makeFullCheckpointOnSchemaChange=false
                     </argLine>
                     <systemPropertyVariables>
                         <buildDirectory>${project.build.directory}</buildDirectory>

diff --git a/tests/build.xml b/tests/build.xml
@@ -88,6 +88,8 @@
             <jvmarg value="-DstorageType=${test.storageType}"/>
         	<jvmarg value="${serializer}" />
             <jvmarg value="-DtestPath=${project.root.dir}"/>
+            <jvmarg value="-Ddb.makeFullCheckpointOnIndexChange=false"/>
+            <jvmarg value="-Ddb.makeFullCheckpointOnSchemaChange=false"/>
             <!-- debug -->
             <!--<jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"/>-->
 
@@ -129,14 +131,14 @@
         <echo>STARTING REMOTE ORIENTDB SERVER INSTANCE...</echo>
         <exec dir="${orient.path}/bin" executable="cmd" spawn="true" osfamily="windows">
             <env key="JAVA_OPTS"
-                 value="-Xmx3G -XX:+HeapDumpOnOutOfMemoryError -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.port=10005 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false -Dstorage.configuration.syncOnUpdate=false -Dindex.flushAfterCreate=false ${serializer}"/>
+                 value="-Xmx3G -XX:+HeapDumpOnOutOfMemoryError -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.port=10005 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false -Dstorage.configuration.syncOnUpdate=false -Dindex.flushAfterCreate=false ${serializer} -Ddb.makeFullCheckpointOnIndexChange=false -Ddb.makeFullCheckpointOnSchemaChange=false"/>
             <env key="CONFIG_FILE" value="${basedir}/src/test/resources/orientdb-server-config.xml"/>
             <arg value="/c start server.bat"/>
         </exec>
 
         <exec dir="${orient.path}/bin" executable="sh" spawn="true" osfamily="unix">
             <env key="JAVA_OPTS"
-                 value="-Xmx3G -XX:+HeapDumpOnOutOfMemoryError -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.port=10005 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false -Dstorage.configuration.syncOnUpdate=false -Dindex.flushAfterCreate=false ${serializer} ${spareSerailizer} "/>
+                 value="-Xmx3G -XX:+HeapDumpOnOutOfMemoryError -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.port=10005 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false -Dstorage.configuration.syncOnUpdate=false -Dindex.flushAfterCreate=false ${serializer} ${spareSerailizer} -Ddb.makeFullCheckpointOnIndexChange=false -Ddb.makeFullCheckpointOnSchemaChange=false"/>
             <!-- <env key="JAVA_OPTS" value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006 -Xmx3G -XX:+HeapDumpOnOutOfMemoryError -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.port=10005 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dstorage.makeFullCheckpointAfterCreate=false -Dstorage.makeFullCheckpointAfterClusterCreate=false -Dstorage.wal.syncOnPageFlush=false -Dstorage.configuration.syncOnUpdate=false -Dindex.flushAfterCreate=false ${serializer} ${spareSerailizer} "/>-->
             <env key="CONFIG_FILE" value="${basedir}/src/test/resources/orientdb-server-config.xml"/>
             <arg value="./server.sh"/>