git-server-git.apps.pok.os.sepia.ceph.com Git

author	Adam C. Emerson <aemerson@redhat.com>
	Wed, 30 Nov 2022 21:45:49 +0000 (16:45 -0500)
committer	Adam C. Emerson <aemerson@redhat.com>
	Tue, 10 Jan 2023 00:03:11 +0000 (19:03 -0500)
commit	adbbdded49adaa0d3ff18edd1dde3e52b75b466c
tree	90f675817cade18d80e81a83a52e4c052670aae7	tree \| snapshot
parent	c641dc66452d4f225a2dd845b414a1d146d5e4d6	commit \| diff

cls/fifo: Merge duplicate journal entries

Since we no longer use tags, journal entries are just an operation and
a part number. If an entry being added is already in the journal, skip
it.

Fixes: https://tracker.ceph.com/issues/57562
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit ade8909991682da9f665e75c16f1662f98f1e51a)
Conflicts:
src/rgw/cls_fifo_legacy.cc
- Upstream dpp

Fixes: https://tracker.ceph.com/issues/58403
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

src/cls/fifo/cls_fifo.cc		diff \| blob \| history
src/cls/fifo/cls_fifo_types.h		diff \| blob \| history
src/rgw/cls_fifo_legacy.cc		diff \| blob \| history