import ceph quincy 17.2.6

[ceph.git] / ceph / src / mon / LogMonitor.cc

diff --git a/ceph/src/mon/LogMonitor.cc b/ceph/src/mon/LogMonitor.cc
index 80e069d593af0f37132ac58eeaef07a77582b50f..2b628cebaafa1340ffbf5a2bf4a381cbf483f379 100644 (file)
--- a/ceph/src/mon/LogMonitor.cc
+++ b/ceph/src/mon/LogMonitor.cc
@@ -913,7 +913,7 @@ bool LogMonitor::preprocess_command(MonOpRequestRef op)
          } else {
            start = from;
          }
-         dout(10) << __func__ << " channnel " << p.first
+         dout(10) << __func__ << " channel " << p.first
                   << " from " << from << " to " << to << dendl;
          for (version_t v = start; v < to; ++v) {
            bufferlist ebl;
@@ -934,6 +934,9 @@ bool LogMonitor::preprocess_command(MonOpRequestRef op)
          entries.erase(entries.begin());
        }
        for (auto& p : entries) {
+         if (!match(p.second)) {
+           continue;
+         }
          if (f) {
            f->dump_object("entry", p.second);
          } else {
@@ -965,10 +968,12 @@ bool LogMonitor::preprocess_command(MonOpRequestRef op)
            LogEntry le;
            auto p = ebl.cbegin();
            decode(le, p);
-           if (f) {
-             f->dump_object("entry", le);
-           } else {
-             ss << le << "\n";
+           if (match(le)) {
+             if (f) {
+               f->dump_object("entry", le);
+             } else {
+               ss << le << "\n";
+             }
            }
          }
        }