hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r702753 - in /hadoop/core/branches/branch-0.19: ./ .eclipse.templates/ lib/ src/examples/org/apache/hadoop/examples/
Date Wed, 08 Oct 2008 08:29:59 GMT
Author: enis
Date: Wed Oct  8 01:29:59 2008
New Revision: 702753

URL: http://svn.apache.org/viewvc?rev=702753&view=rev
Log:
Merge -r702751:702752 from trunk to branch-0.19. Fixes HADOOP-4267. 

Added:
    hadoop/core/branches/branch-0.19/lib/hsqldb-1.8.0.10.LICENSE.txt
      - copied unchanged from r702752, hadoop/core/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt
    hadoop/core/branches/branch-0.19/lib/hsqldb-1.8.0.10.jar
      - copied unchanged from r702752, hadoop/core/trunk/lib/hsqldb-1.8.0.10.jar
Removed:
    hadoop/core/branches/branch-0.19/lib/hsqldb-LICENSE.txt
    hadoop/core/branches/branch-0.19/lib/hsqldb.jar
Modified:
    hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath
    hadoop/core/branches/branch-0.19/CHANGES.txt
    hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java

Modified: hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath?rev=702753&r1=702752&r2=702753&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath (original)
+++ hadoop/core/branches/branch-0.19/.eclipse.templates/.classpath Wed Oct  8 01:29:59 2008
@@ -19,7 +19,7 @@
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-net-1.4.1.jar"/>
-	<classpathentry kind="lib" path="lib/hsqldb.jar"/>
+	<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
 	<classpathentry kind="lib" path="lib/jets3t-0.6.1.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-5.1.4.jar"/>
 	<classpathentry kind="lib" path="lib/jetty-ext/commons-el.jar"/>

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=702753&r1=702752&r2=702753&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Wed Oct  8 01:29:59 2008
@@ -813,6 +813,9 @@
     HADOOP-4256. Removes Completed and Failed Job tables from 
     jobqueue_details.jsp. (Sreekanth Ramakrishnan via ddas)
 
+    HADOOP-4267. Occasional exceptions during shutting down HSQLDB is logged 
+    but not rethrown. (enis) 
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

Modified: hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java?rev=702753&r1=702752&r2=702753&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java
(original)
+++ hadoop/core/branches/branch-0.19/src/examples/org/apache/hadoop/examples/DBCountPageView.java
Wed Oct  8 01:29:59 2008
@@ -49,6 +49,7 @@
 import org.apache.hadoop.mapred.lib.db.DBInputFormat;
 import org.apache.hadoop.mapred.lib.db.DBOutputFormat;
 import org.apache.hadoop.mapred.lib.db.DBWritable;
+import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.hsqldb.Server;
@@ -99,13 +100,22 @@
     connection.setAutoCommit(false);
   }
 
-  private void shutdown() throws SQLException {
-    connection.commit();
-    connection.close();
-    
-    if(server != null) {
-      server.stop();
-      server.shutdown();
+  private void shutdown() {
+    try {
+      connection.commit();
+      connection.close();
+    }catch (Throwable ex) {
+      LOG.warn("Exception occurred while closing connection :"
+          + StringUtils.stringifyException(ex));
+    } finally {
+      try {
+        if(server != null) {
+          server.shutdown();
+        }
+      }catch (Throwable ex) {
+        LOG.warn("Exception occurred while shutting down HSQLDB :"
+            + StringUtils.stringifyException(ex));
+      }
     }
   }
 



Mime
View raw message