QPID-5425: TPL fails with JERR_JNLF_FILEOFFSOVFL

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1551361 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 19 insertions, 7 deletions

diff --git a/qpid/cpp/examples/messaging/CMakeLists.txt b/qpid/cpp/examples/messaging/CMakeLists.txt
index 5481f2f0bf..cb56151cc0 100644
--- a/qpid/cpp/examples/messaging/CMakeLists.txt
+++ b/qpid/cpp/examples/messaging/CMakeLists.txt
@@ -51,6 +51,10 @@ add_messaging_example(client)
 add_messaging_example(server)
 add_messaging_example(server_reconnect)
 
+add_executable(qc2_spout qc2_spout.cpp Formatter.cpp Utils.cpp OptionParser.cpp)
+set_target_properties(qc2_spout PROPERTIES OUTPUT_NAME qc2_spout)
+target_link_libraries(qc2_spout qpidmessaging qpidtypes ${_boost_libs_needed})
+
 # These don't need Boost or OptionParser
 add_executable(hello_world hello_world.cpp)
 set_target_properties(hello_world PROPERTIES OUTPUT_NAME hello_world)
diff --git a/qpid/cpp/src/qpid/linearstore/ISSUES b/qpid/cpp/src/qpid/linearstore/ISSUES
index 6868614446..97a9e3fb2a 100644
--- a/qpid/cpp/src/qpid/linearstore/ISSUES
+++ b/qpid/cpp/src/qpid/linearstore/ISSUES
@@ -46,12 +46,20 @@ Store:
    * Store analysis and status
    * Recovery/reading of message content
 
+8. One journal file lost when queue deleted. All files except for one are recycled back to the EFP.
+
+9. Complete exceptions - several exceptions thrown using jexception have no exception numbers
+
 Current bugs and performance issues:
 ------------------------------------
-1. RH Bugzilla 1035843 - Slow performance for producers
+1. BZ 1035843 - Slow performance for producers
 2. (FIXED) QPID-5387 (BZ 1036071) - Crash when deleting queue
 3. (FIXED) QPID-5388 (BZ 1035802) - Segmentation fault when recovering empty queue
-4. RH Bugzilla 1036026 - Unable to create durable queue - framing error
+4. (UNABLE TO REPRODUCE) BZ 1036026 - Unable to create durable queue - framing error - possibly caused by running both stores at the same time
+5. (UNABLE TO REPRODUCE) BZ 1038599 - Abort when deleting used queue after restart - may be dup of QPID-5387 (BZ 1036071)
+6. BZ 1039522 - Crash during recovery - JournalFile::getFqFileName() -JERR_JREC_BADRECTAIL
+6. BZ 1039525 - Crash during recovery - journal::jexception - JERR_JREC_BADRECTAIL
+7. BZ 1039949 - DTX test failure - missing XIDs
 
 Code tidy-up
 ------------
diff --git a/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
index 8226741e4a..cb03978696 100644
--- a/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
@@ -380,7 +380,7 @@ jcntl::handle_aio_wait(const iores res, iores& resout, const data_tok* dtp)
         while (_wmgr.curr_pg_blocked())
         {
             if (_wmgr.get_aio_evt_rem() == 0) {
-std::cout << "&&&&&& jcntl::handle_aio_wait() " << _wmgr.status_str() << std::endl; // DEBUG
+//std::cout << "&&&&&& jcntl::handle_aio_wait() " << _wmgr.status_str() << std::endl; // DEBUG
                 throw jexception("_wmgr.curr_pg_blocked() with no events remaining"); // TODO - complete exception
             }
             if (_wmgr.get_events(&_aio_cmpl_timeout, false) == jerrno::AIO_TIMEOUT)
diff --git a/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
index 6eaa8835be..9b94c7959d 100644
--- a/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
@@ -621,8 +621,8 @@ wmgr::flush_check(iores& res,
         }
 
         // If file is full, rotate to next file
-        uint32_t fileSize_pgs = _lfc.fileSize_sblks() / _cache_pgsize_sblks;
-        if (_pg_cntr >= fileSize_pgs)
+        uint32_t dataSize_pgs = _lfc.dataSize_sblks() / _cache_pgsize_sblks;
+        if (_pg_cntr >= dataSize_pgs)
         {
 //std::cout << _pg_cntr << ">=" << fileSize_pgs << std::flush;
             get_next_file();
@@ -638,8 +638,8 @@ iores
 wmgr::flush()
 {
     iores res = write_flush();
-    uint32_t fileSize_pgs = _lfc.fileSize_sblks() / _cache_pgsize_sblks;
-    if (res == RHM_IORES_SUCCESS && _pg_cntr >= fileSize_pgs) {
+    uint32_t dataSize_pgs = _lfc.dataSize_sblks() / _cache_pgsize_sblks;
+    if (res == RHM_IORES_SUCCESS && _pg_cntr >= dataSize_pgs) {
         get_next_file();
     }
     return res;