Revert "MB-39946: Catch underflow exception and dump flusher state"

This reverts commit 0ee4146.

This commit was only added for gathering detailed flusher state
when the bug occurs and is not needed once MB-39946 is resolved.

Change-Id: Ib98d619d2b836fafd4d2cdd66c89d3f86abb954a
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/140212
Tested-by: Build Bot <[email protected]>
Reviewed-by: Trond Norbye <[email protected]>

Author: jimwwalker

engines/ep/src/collections/flush.cc

@@ -105,24 +105,10 @@ void Flush::saveCollectionStats(
 
         // Generate new stats, add the deltas from this flush batch for count
         // and size and set the high-seqno
-        try {
-            PersistedStats ps(stats.itemCount + flushStats.getItemCount(),
-                              flushStats.getPersistedHighSeqno(),
-                              stats.diskSize + flushStats.getDiskSize());
-            cb(cid, ps);
-        } catch (const std::exception& e) {
-            EP_LOG_CRITICAL("Flush::saveCollectionStats caught exception {}",
-                            e.what());
-            EP_LOG_CRITICAL(
-                    "Flush::saveCollectionStats items:{} + {}, highSeq:{}, "
-                    "diskSize:{} + {}",
-                    stats.itemCount,
-                    flushStats.getItemCount(),
-                    flushStats.getPersistedHighSeqno(),
-                    stats.diskSize,
-                    flushStats.getDiskSize());
-            throw;
-        }
+        PersistedStats ps(stats.itemCount + flushStats.getItemCount(),
+                          flushStats.getPersistedHighSeqno(),
+                          stats.diskSize + flushStats.getDiskSize());
+        cb(cid, ps);
     }
 }
 

engines/ep/src/couch-kvstore/couch-kvstore.cc

@@ -2769,38 +2769,12 @@ couchstore_error_t CouchKVStore::saveDocs(Vbid vbid,
     state.updateOnDiskPrepareBytes(kvctx.onDiskPrepareBytesDelta);
     pendingLocalReqsQ.emplace_back("_local/vbstate", makeJsonVBState(state));
 
-    try {
-        kvctx.commitData.collections.saveCollectionStats(
-                std::bind(&CouchKVStore::saveCollectionStats,
-                          this,
-                          std::ref(*db),
-                          std::placeholders::_1,
-                          std::placeholders::_2));
-
-    } catch (const std::exception& e) {
-        // Dump the flush batch
-        logger.critical(
-                "CouchKVStore::saveDocs {} saveCollectionStats exception {} "
-                "docs:{}",
-                vbid,
-                e.what(),
-                docs.size());
-
-        for (size_t ii = 0; ii < docs.size(); ii++) {
-            auto key = makeDiskDocKey(docinfos[ii]->id);
-            logger.critical(
-                    "CouchKVStore::saveDocs info key:{}, seq:{}, rev:{}, "
-                    "deleted:{}, cm:{}, value_size:{}",
-                    key.to_string(),
-                    docinfos[ii]->db_seq,
-                    docinfos[ii]->rev_seq,
-                    docinfos[ii]->deleted,
-                    int(docinfos[ii]->content_meta),
-                    docs[ii] ? docs[ii]->data.size : 0);
-        }
-
-        throw;
-    }
+    kvctx.commitData.collections.saveCollectionStats(
+            std::bind(&CouchKVStore::saveCollectionStats,
+                      this,
+                      std::ref(*db),
+                      std::placeholders::_1,
+                      std::placeholders::_2));
 
     if (kvctx.commitData.collections.isReadyForCommit()) {
         updateCollectionsMeta(*db, kvctx.commitData.collections);