Skip to main content

[xadisk~svn:543] 1. During commit/rollback, the logInputStreams should be closed prior to

  • From: nitin_verma@...
  • To: commits@...
  • Subject: [xadisk~svn:543] 1. During commit/rollback, the logInputStreams should be closed prior to
  • Date: Mon, 26 Aug 2013 04:55:41 +0000

Project:    xadisk
Repository: svn
Revision:   543
Author:     nitin_verma
Date:       2013-08-26 04:55:40 UTC
Link:       

Log Message:
------------
1. During commit/rollback, the logInputStreams should be closed prior to 
cleanup.
2. Increasing the sleep time during retrying of an io operation.


Revisions:
----------
543


Modified Paths:
---------------
trunk/src/org/xadisk/filesystem/NativeSession.java


Diffs:
------
Index: trunk/src/org/xadisk/filesystem/NativeSession.java
===================================================================
--- trunk/src/org/xadisk/filesystem/NativeSession.java  (revision 542)
+++ trunk/src/org/xadisk/filesystem/NativeSession.java  (revision 543)
@@ -749,6 +749,11 @@
             }
             diskSession.forceToDisk();
             
xaFileSystem.getTheGatheringDiskWriter().transactionCompletes(xid, true);
+            for(FileInputStream logInputStream: logInputStreams) {
+                MiscUtils.closeAll(logInputStream);
+                //need to close logs here to allow cleanup of logs in 
crashRecoveryWorker.
+            }
+            logInputStreams.clear();//to avoid the loop in finally block.
             cleanup();
             raiseFileStateChangeEvents();
         } catch (IOException ioe) {
@@ -1053,6 +1058,11 @@
                 }
             }
             
xaFileSystem.getTheGatheringDiskWriter().transactionCompletes(xid, false);
+            for(FileInputStream logInputStream: logInputStreams) {
+                MiscUtils.closeAll(logInputStream);
+                //need to close logs here to allow cleanup of logs in 
crashRecoveryWorker.
+            }
+            logInputStreams.clear();//to avoid the loop in finally block.
             cleanup();
         } catch (IOException ioe) {
             xaFileSystem.notifySystemFailure(ioe);





[xadisk~svn:543] 1. During commit/rollback, the logInputStreams should be closed prior to

nitin_verma 08/26/2013
 
 
Close
loading
Please Confirm
Close