[rhmessaging-commits] rhmessaging commits: r3863 - in store/trunk/cpp: lib/jrnl and 1 other directories.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2010-03-09 09:13:02 -0500 (Tue, 09 Mar 2010)
New Revision: 3863

Modified:
   store/trunk/cpp/lib/MessageStoreImpl.cpp
   store/trunk/cpp/lib/jrnl/jexception.hpp
   store/trunk/cpp/tests/cluster/cluster_tests_env.sh
   store/trunk/cpp/tests/cluster/run_cpp_cluster_tests
   store/trunk/cpp/tests/cluster/run_python_cluster_tests
Log:
Some tidy up; logging statements added for BZ492334.

Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp	2010-03-03 21:02:49 UTC (rev 3862)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp	2010-03-09 14:13:02 UTC (rev 3863)
@@ -345,12 +345,15 @@
         tplStorePtr.reset(new TplJournalImpl("TplStore", getTplBaseDir(), "tpl", defJournalGetEventsTimeout, defJournalFlushTimeout, agent));
         txn.commit();
     } catch (const journal::jexception& e) {
+        QPID_LOG(error, "Journal Exception occurred while initializing store: " << e);
         txn.abort();
         THROW_STORE_EXCEPTION_2("Error opening tplStore instance", e.what());
     } catch (const DbException& e) {
+        QPID_LOG(error, "BDB exception occurred while initializing store: " << e.what());
         txn.abort();
         THROW_STORE_EXCEPTION_2("Error opening databases", e);
     } catch (...) {
+        QPID_LOG(error, "Unknown exception occurred while initializing store.");
         txn.abort();
         throw;
     }

Modified: store/trunk/cpp/lib/jrnl/jexception.hpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jexception.hpp	2010-03-03 21:02:49 UTC (rev 3862)
+++ store/trunk/cpp/lib/jrnl/jexception.hpp	2010-03-09 14:13:02 UTC (rev 3863)
@@ -60,6 +60,8 @@
     throw jexception(jerrno::JERR__MALLOC, oss.str(), cls, fn); \
     }
 
+// TODO: The following is a temporary bug-tracking aid which forces a core.
+// Replace with the commented out version below when BZ484048 is resolved.
 #define PTHREAD_CHK(err, pfn, cls, fn) if(err != 0) { \
     std::ostringstream oss; \
     oss << cls << "::" << fn << "(): " << pfn; \
@@ -67,6 +69,13 @@
     ::perror(oss.str().c_str()); \
     ::abort(); \
     }
+/*
+#define PTHREAD_CHK(err, pfn, cls, fn) if(err != 0) { \
+    std::ostringstream oss; \
+    oss << pfn << " failed: " << FORMAT_SYSERR(err); \
+    throw jexception(jerrno::JERR__PTHREAD, oss.str(), cls, fn); \
+    }
+*/
 
 #define ASSERT(cond, msg) if(cond == 0) { \
     std::cerr << msg << std::endl; \

Modified: store/trunk/cpp/tests/cluster/cluster_tests_env.sh
===================================================================
--- store/trunk/cpp/tests/cluster/cluster_tests_env.sh	2010-03-03 21:02:49 UTC (rev 3862)
+++ store/trunk/cpp/tests/cluster/cluster_tests_env.sh	2010-03-09 14:13:02 UTC (rev 3863)
@@ -50,7 +50,7 @@
 
 
 func_check_clustering ()
-#----------------
+#-----------------------
 # Check openAIS/corosync is running and user has correct privileges
 # Params: None
 # Returns: 0 if openAIS/corosync is running, 1 otherwise

Modified: store/trunk/cpp/tests/cluster/run_cpp_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_cpp_cluster_tests	2010-03-03 21:02:49 UTC (rev 3862)
+++ store/trunk/cpp/tests/cluster/run_cpp_cluster_tests	2010-03-09 14:13:02 UTC (rev 3863)
@@ -23,6 +23,7 @@
 
 . `dirname $0`/cluster_tests_env.sh
 
+echo "Running C++ cluster tests..."
 if test $COROSYNC; then
     ${CPP_CLUSTER_EXEC}
     RETCODE=$?

Modified: store/trunk/cpp/tests/cluster/run_python_cluster_tests
===================================================================
--- store/trunk/cpp/tests/cluster/run_python_cluster_tests	2010-03-03 21:02:49 UTC (rev 3862)
+++ store/trunk/cpp/tests/cluster/run_python_cluster_tests	2010-03-09 14:13:02 UTC (rev 3863)
@@ -40,8 +40,6 @@
     sg ais -c "$TEST_CMD"
     RETCODE=$?
 fi
-#sg ais -c "${PYTHON_DIR}/qpid-python-test -m cluster_tests ${CLUSTER_TESTS_IGNORE} ${CLUSTER_TESTS} -DOUTDIR=$OUTDIR"
-#RETCODE=$?
 
 if test x${RETCODE} != x0; then 
     exit 1;