rhmessaging commits: r3537 - in store/trunk/cpp/tests/jrnl: jtt and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2009-08-04 10:11:24 -0400 (Tue, 04 Aug 2009)
New Revision: 3537
Modified:
store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp
Log:
Fix for a test error in which the directory containing the journal is deleted before the file handles are closed - this causes the test to fail on NFS. (see Bug 513622 - "Error deleting queue if store directory is on NFS")
Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2009-07-31 19:45:42 UTC (rev 3536)
+++ store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2009-08-04 14:11:24 UTC (rev 3537)
@@ -377,7 +377,7 @@
}
/*
- * Method create_journal(): Used to create the dummy journal files from the built-up map created by calling
+ * Method write_journal(): Used to create the dummy journal files from the built-up map created by calling
* initial_journal_create() and optionally journal_append() one or more times. Since the jinf object reads the
* jinf file and the file headers only, the create object creates a dummy journal file containing only a file
* header (512 bytes each) and a single jinf file which contains the journal metadata required for recovery
Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2009-07-31 19:45:42 UTC (rev 3536)
+++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2009-08-04 14:11:24 UTC (rev 3537)
@@ -152,11 +152,11 @@
::pthread_join(_read_thread, 0);
::pthread_join(_enq_thread, 0);
stop(true);
- _tcrp->set_stop_time();
}
catch (const mrg::journal::jexception& e) { _tcrp->add_exception(e); panic(); }
catch (const std::exception& e) { _tcrp->add_exception(e.what()); panic(); }
catch (...) { _tcrp->add_exception("Unknown exception"); panic(); }
+ _lpmgr.finalize();
_tcrp->set_stop_time();
_tcp->add_result(_tcrp);
}
16 years, 8 months
- 1
- 0