mds: fix assert(omap_num_objs <= MAX_OBJECTS) of OpenFileTable

Current behavior of the loop that commits dirty items is:

- If the last object is not full, it will be chosen for new item.
- If the last object becomes full, a new object is allocated, which
  becomes the new last object.

Above logical can make object count increase even there is free object.

Fixes: https://tracker.ceph.com/issues/36094
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 21b1069eab43fdc2c91915d22f45802d017702fc)

diff --git a/src/mds/OpenFileTable.cc b/src/mds/OpenFileTable.cc
index c0f72d581d23729cd4939b39ad8563464b43634f..a9b12cd3e549d74778d589f0d85c3307d260e465 100644 (file)
--- a/src/mds/OpenFileTable.cc
+++ b/src/mds/OpenFileTable.cc
@@ -465,8 +465,10 @@ void OpenFileTable::commit(MDSInternalContextBase *c, uint64_t log_seq, int op_p
        assert(it.second == DIRTY_NEW);
        // find omap object to store the key
        for (unsigned i = first_free_idx; i < omap_num_objs; i++) {
-         if (omap_num_items[i] < MAX_ITEMS_PER_OBJ)
+         if (omap_num_items[i] < MAX_ITEMS_PER_OBJ) {
            omap_idx = i;
+           break;
+         }
        }
        if (omap_idx < 0) {
          ++omap_num_objs;