Author: kpvdr
Date: 2008-11-14 12:52:18 -0500 (Fri, 14 Nov 2008)
New Revision: 2803
Modified:
store/trunk/cpp/lib/MessageStoreImpl.cpp
store/trunk/cpp/lib/jrnl/jinf.cpp
Log:
Fix for BZ471612 - "Journal auto expand options and status visible when not yet
enabled in source"
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-11-14 17:33:09 UTC (rev 2802)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2008-11-14 17:52:18 UTC (rev 2803)
@@ -326,8 +326,9 @@
isInit = true;
QPID_LOG(notice, "Store module initialized; dir=" << dir);
QPID_LOG(info, "> Default files per journal: " << jfiles);
- QPID_LOG(info, "> Auto-expand " << (autoJrnlExpand ?
"enabled" : "disabled"));
- if (autoJrnlExpand) QPID_LOG(info, "> Max auto-expand journal files: "
<< autoJrnlExpandMaxFiles);
+// TODO: Uncomment these lines when auto-expand is enabled.
+// QPID_LOG(info, "> Auto-expand " << (autoJrnlExpand ?
"enabled" : "disabled"));
+// if (autoJrnlExpand) QPID_LOG(info, "> Max auto-expand journal files:
" << autoJrnlExpandMaxFiles);
QPID_LOG(info, "> Default journal file size: " << jfileSizePgs
<< " (wpgs)");
QPID_LOG(info, "> Default write cache page size: " <<
wCachePageSizeKib << " (Kib)");
QPID_LOG(info, "> Default number of write cache pages: " <<
wCacheNumPages);
@@ -1759,11 +1760,12 @@
"Required if --no-data-dir is also used.")
("num-jfiles", qpid::optValue(numJrnlFiles, "N"),
"Default number of files for each journal instance (queue).")
- ("auto-expand", qpid::optValue(autoJrnlExpand, "yes|no"),
- "If yes|true|1, allows journal to auto-expand by adding additional
journal files as needed. "
- "If no|false|0, the number of journal files will remain fixed
(num-jfiles).")
- ("max-auto-expand-jfiles", qpid::optValue(autoJrnlExpandMaxFiles,
"N"),
- "Maximum number of journal files allowed from auto-expanding; must
be greater than --num-jfiles parameter.")
+// TODO: Uncomment these lines when auto-expand is enabled.
+// ("auto-expand", qpid::optValue(autoJrnlExpand, "yes|no"),
+// "If yes|true|1, allows journal to auto-expand by adding
additional journal files as needed. "
+// "If no|false|0, the number of journal files will remain fixed
(num-jfiles).")
+// ("max-auto-expand-jfiles", qpid::optValue(autoJrnlExpandMaxFiles,
"N"),
+// "Maximum number of journal files allowed from auto-expanding;
must be greater than --num-jfiles parameter.")
("jfile-size-pgs", qpid::optValue(jrnlFsizePgs, "N"),
"Default size for each journal file in multiples of read pages (1
read page = 64kiB)")
("wcache-page-size", qpid::optValue(wCachePageSizeKib, "N"),
Modified: store/trunk/cpp/lib/jrnl/jinf.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jinf.cpp 2008-11-14 17:33:09 UTC (rev 2802)
+++ store/trunk/cpp/lib/jrnl/jinf.cpp 2008-11-14 17:52:18 UTC (rev 2803)
@@ -303,8 +303,9 @@
oss << " Journal base filename: \"" << _base_filename
<< "\"" << std::endl;
oss << " Journal version: " << (unsigned)_jver <<
std::endl;
oss << " Number of journal files: " << _num_jfiles <<
std::endl;
- oss << " Auto-expand mode: " << (_ae ? "enabled" :
"disabled") << std::endl;
- if (_ae) oss << " Max. number of journal files (in auto-expand mode):
" << _ae_max_jfiles << std::endl;
+// TODO: Uncomment these lines when auto-expand is enabled.
+// oss << " Auto-expand mode: " << (_ae ? "enabled" :
"disabled") << std::endl;
+// if (_ae) oss << " Max. number of journal files (in auto-expand mode):
" << _ae_max_jfiles << std::endl;
oss << " Journal file size: " << _jfsize_sblks << "
sblks" << std::endl;
oss << " Softblock size (JRNL_SBLK_SIZE): " <<
_sblk_size_dblks << " dblks" << std::endl;
oss << " Datablock size (JRNL_DBLK_SIZE): " << _dblk_size
<< " bytes" << std::endl;
Show replies by date