From be007708cc58f96920c275b4bce70d03e2811cfd Mon Sep 17 00:00:00 2001 From: jiawd Date: Thu, 11 Nov 2021 03:49:29 +0000 Subject: [PATCH] osdc: add set_error in BufferHead, when split set_error to right Fixes: https://tracker.ceph.com/issues/53227 Signed-off-by: jiawd (cherry picked from commit dba751ac0c0e9c8276a59ea3337b31fc71e26bf0) --- src/osdc/ObjectCacher.cc | 1 + src/osdc/ObjectCacher.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 7522c8258c83f..f2b6d9736749f 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -118,6 +118,7 @@ ObjectCacher::BufferHead *ObjectCacher::Object::split(BufferHead *left, right->last_write_tid = left->last_write_tid; right->last_read_tid = left->last_read_tid; right->set_state(left->get_state()); + right->set_error(left->error); right->snapc = left->snapc; right->set_journal_tid(left->journal_tid); diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h index d5a77cd18aa19..2101692e14054 100644 --- a/src/osdc/ObjectCacher.h +++ b/src/osdc/ObjectCacher.h @@ -161,6 +161,13 @@ class ObjectCacher { } int get_state() const { return state; } + inline int get_error() const { + return error; + } + inline void set_error(int _error) { + error = _error; + } + inline ceph_tid_t get_journal_tid() const { return journal_tid; } -- 2.39.5