Author: kpvdr
Date: 2010-08-20 13:57:14 -0400 (Fri, 20 Aug 2010)
New Revision: 4215
Modified:
store/trunk/cpp/rhel4-support/rhel4.patch
Log:
Correction to RHEL-4 patch
Modified: store/trunk/cpp/rhel4-support/rhel4.patch
===================================================================
--- store/trunk/cpp/rhel4-support/rhel4.patch 2010-08-20 14:03:13 UTC (rev 4214)
+++ store/trunk/cpp/rhel4-support/rhel4.patch 2010-08-20 17:57:14 UTC (rev 4215)
@@ -1,6 +1,6 @@
Index: tests/.valgrind.supp
===================================================================
---- tests/.valgrind.supp (revision 3545)
+--- tests/.valgrind.supp (revision 4214)
+++ tests/.valgrind.supp (working copy)
@@ -1,33 +1,74 @@
{
@@ -102,7 +102,7 @@
Index: configure.ac
===================================================================
---- configure.ac (revision 3545)
+--- configure.ac (revision 4214)
+++ configure.ac (working copy)
@@ -62,7 +62,6 @@
# -Wshadow - warns about boost headers.
@@ -122,16 +122,19 @@
AC_SUBST([WARNING_CFLAGS], [$COMPILER_FLAGS])
Index: lib/MessageStoreImpl.cpp
===================================================================
---- lib/MessageStoreImpl.cpp (revision 3545)
-+++ lib/MessageStoreImpl.cpp (working copy)
-@@ -314,10 +314,6 @@
- dbenv->set_lg_regionmax(256000); // default = 65000
- dbenv->open(getBdbBaseDir().c_str(), DB_THREAD | DB_CREATE | DB_INIT_TXN |
DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON | DB_RECOVER, 0);
- } catch (const DbException& e) {
-- if (e.get_errno() == DB_VERSION_MISMATCH)
-- THROW_STORE_EXCEPTION_2("Database environment mismatch: This version of
bd4 does not match that which created the store database. "
-- "(If recovery is not important, delete the
contents of the store directory. Otherwise, try upgrading the database using "
-- "db_upgrade or using db_recover - but the
db4-utils package must also be installed to use these utilities.)", e);
- THROW_STORE_EXCEPTION_2("Error opening environment", e);
- }
-
+ --- lib/MessageStoreImpl.cpp (revision 4214)
++++ lib/MessageStoreImpl.cpp (working copy)
+@@ -355,13 +355,6 @@
+ tplStorePtr.reset(new TplJournalImpl(timer, "TplStore",
getTplBaseDir(), "tpl", defJournalGetEventsTimeout, defJournalFlushTimeout,
agent));
+ isInit = true;
+ } catch (const DbException& e) {
+- if (e.get_errno() == DB_VERSION_MISMATCH)
+- {
+- QPID_LOG(error, "Database environment mismatch: This version of db4
does not match that which created the store database.: " << e.what());
+- THROW_STORE_EXCEPTION_2("Database environment mismatch: This
version of db4 does not match that which created the store database. "
+- "(If recovery is not important, delete the
contents of the store directory. Otherwise, try upgrading the database using "
+- "db_upgrade or using db_recover - but the
db4-utils package must also be installed to use these utilities.)", e);
+- }
+ QPID_LOG(error, "BDB exception occurred while initializing store:
" << e.what());
+ if (bdbRetryCnt >= retryMax)
+ THROW_STORE_EXCEPTION_2("BDB exception occurred while initializing
store", e);