crimson/os/seastore: cleanup, reuse onode[op->oid]

cyx1231st · myoungwon · commit 5026c1d5e4c0 · 2025-02-20T12:29:16.000Z
Signed-off-by: Yingxin Cheng &lt;yingxin.cheng@intel.com&gt;
Signed-off-by: Myoungwon Oh &lt;myoungwon.oh@samsung.com&gt;
diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
@@ -1807,10 +1807,10 @@ SeaStore::Shard::_do_transaction_step(
     }
   }
   return fut.si_then([&, op, this, FNAME](auto get_onode) {
-    OnodeRef &o = onodes[op->oid];
-    if (!o) {
+    OnodeRef& onode = onodes[op->oid];
+    if (!onode) {
       assert(get_onode);
-      o = get_onode;
+      onode = get_onode;
     }
     OnodeRef& d_onode = onodes[op->dest_oid];
     if ((op->op == Transaction::OP_CLONE
@@ -1833,21 +1833,23 @@ SeaStore::Shard::_do_transaction_step(
     }
   }).si_then([&ctx, &i, &onodes, op, this, FNAME]() -> tm_ret {
     const ghobject_t& oid = i.get_oid(op->oid);
+    OnodeRef& onode = onodes[op->oid];
+    assert(onode);
     try {
       switch (op->op) {
       case Transaction::OP_REMOVE:
       {
         DEBUGT("op REMOVE, oid={} ...", *ctx.transaction, oid);
-        return _remove(ctx, onodes[op->oid]
-	).si_then([&onodes, op] {
-	  onodes[op->oid].reset();
+        return _remove(ctx, onode
+	).si_then([&onode] {
+	  onode.reset();
 	});
       }
       case Transaction::OP_CREATE:
       case Transaction::OP_TOUCH:
       {
         DEBUGT("op CREATE/TOUCH, oid={} ...", *ctx.transaction, oid);
-        return _touch(ctx, onodes[op->oid]);
+        return _touch(ctx, onode);
       }
       case Transaction::OP_WRITE:
       {
@@ -1859,14 +1861,14 @@ SeaStore::Shard::_do_transaction_step(
         DEBUGT("op WRITE, oid={}, 0x{:x}~0x{:x}, flags=0x{:x} ...",
                *ctx.transaction, oid, off, len, fadvise_flags);
         return _write(
-	  ctx, onodes[op->oid], off, len, std::move(bl),
+	  ctx, onode, off, len, std::move(bl),
 	  fadvise_flags);
       }
       case Transaction::OP_TRUNCATE:
       {
         uint64_t off = op->off;
         DEBUGT("op TRUNCATE, oid={}, 0x{:x} ...", *ctx.transaction, oid, off);
-        return _truncate(ctx, onodes[op->oid], off);
+        return _truncate(ctx, onode, off);
       }
       case Transaction::OP_SETATTR:
       {
@@ -1876,36 +1878,39 @@ SeaStore::Shard::_do_transaction_step(
         i.decode_bl(bl);
         DEBUGT("op SETATTR, oid={}, attr name={}, value length=0x{:x} ...",
                *ctx.transaction, oid, name, bl.length());
-        return _setattrs(ctx, onodes[op->oid], std::move(to_set));
+        return _setattrs(ctx, onode, std::move(to_set));
       }
       case Transaction::OP_SETATTRS:
       {
         std::map<std::string, bufferlist> to_set;
         i.decode_attrset(to_set);
         DEBUGT("op SETATTRS, oid={}, attrs size={} ...",
                *ctx.transaction, oid, to_set.size());
-        return _setattrs(ctx, onodes[op->oid], std::move(to_set));
+        return _setattrs(ctx, onode, std::move(to_set));
       }
       case Transaction::OP_RMATTR:
       {
         std::string name = i.decode_string();
         DEBUGT("op RMATTR, oid={}, attr name={} ...",
                *ctx.transaction, oid, name);
-        return _rmattr(ctx, onodes[op->oid], name);
+        return _rmattr(ctx, onode, name);
       }
       case Transaction::OP_RMATTRS:
       {
         DEBUGT("op RMATTRS, oid={} ...", *ctx.transaction, oid);
-        return _rmattrs(ctx, onodes[op->oid]);
+        return _rmattrs(ctx, onode);
       }
       case Transaction::OP_OMAP_SETKEYS:
       {
         std::map<std::string, ceph::bufferlist> aset;
         i.decode_attrset(aset);
-	const omap_root_le_t &root = select_log_omap_root(*onodes[op->oid]);
+	const omap_root_le_t &root = select_log_omap_root(*onode);
         DEBUGT("op OMAP_SETKEYS, oid={}, omap size={}, type={} ...",
                *ctx.transaction, oid, aset.size(), root.get_type());
-        return _omap_set_values(ctx, onodes[op->oid], std::move(aset),
+        return _omap_set_values(
+          ctx,
+          onode,
+          std::move(aset),
 	  root);
       }
       case Transaction::OP_OMAP_SETHEADER:
@@ -1914,42 +1919,47 @@ SeaStore::Shard::_do_transaction_step(
         i.decode_bl(bl);
         DEBUGT("op OMAP_SETHEADER, oid={}, length=0x{:x} ...",
                *ctx.transaction, oid, bl.length());
-        return _omap_set_header(ctx, onodes[op->oid], std::move(bl));
+        return _omap_set_header(ctx, onode, std::move(bl));
       }
       case Transaction::OP_OMAP_RMKEYS:
       {
         omap_keys_t keys;
         i.decode_keyset(keys);
-	const omap_root_le_t &root = select_log_omap_root(*onodes[op->oid]);
+	const omap_root_le_t &root = select_log_omap_root(*onode);
         DEBUGT("op OMAP_RMKEYS, oid={}, omap size={}, type={} ...",
                *ctx.transaction, oid, keys.size(), root.get_type());
-        return _omap_rmkeys(ctx, onodes[op->oid], std::move(keys), root);
+        return _omap_rmkeys(
+          ctx,
+          onode,
+          std::move(keys),
+	  root);
       }
       case Transaction::OP_OMAP_RMKEYRANGE:
       {
         std::string first, last;
         first = i.decode_string();
         last = i.decode_string();
-	const omap_root_le_t &root = select_log_omap_root(*onodes[op->oid]);
+	const omap_root_le_t &root = select_log_omap_root(*onode);
         DEBUGT("op OMAP_RMKEYRANGE, oid={}, first={}, last={}, type={}...",
                *ctx.transaction, oid, first, last, root.get_type());
         return _omap_rmkeyrange(
-	  ctx, onodes[op->oid],
-	  std::move(first), std::move(last),
+          ctx,
+          onode,
+          std::move(first), std::move(last),
 	  root);
       }
       case Transaction::OP_OMAP_CLEAR:
       {
         DEBUGT("op OMAP_CLEAR, oid={} ...", *ctx.transaction, oid);
-        return _omap_clear(ctx, onodes[op->oid]);
+        return _omap_clear(ctx, onode);
       }
       case Transaction::OP_ZERO:
       {
         objaddr_t off = op->off;
         extent_len_t len = op->len;
         DEBUGT("op ZERO, oid={}, 0x{:x}~0x{:x} ...",
                *ctx.transaction, oid, off, len);
-        return _zero(ctx, onodes[op->oid], off, len);
+        return _zero(ctx, onode, off, len);
       }
       case Transaction::OP_SETALLOCHINT:
       {
@@ -1978,17 +1988,17 @@ SeaStore::Shard::_do_transaction_step(
       {
         DEBUGT("op CLONE, oid={}, dest oid={} ...",
                *ctx.transaction, oid, i.get_oid(op->dest_oid));
-	return _clone(ctx, onodes[op->oid], onodes[op->dest_oid]);
+	return _clone(ctx, onode, onodes[op->dest_oid]);
       }
       case Transaction::OP_COLL_MOVE_RENAME:
       {
         DEBUGT("op COLL_MOVE_RENAME, oid={}, dest oid={} ...",
                *ctx.transaction, oid, i.get_oid(op->dest_oid));
 	ceph_assert(op->cid == op->dest_cid);
 	return _rename(
-	  ctx, onodes[op->oid], onodes[op->dest_oid]
-	).si_then([&onodes, op] {
-	  onodes[op->oid].reset();
+	  ctx, onode, onodes[op->dest_oid]
+	).si_then([&onode] {
+	  onode.reset();
 	});
       }
       default:

Original file line number	Diff line number	Diff line change
`@@ -1807,10 +1807,10 @@ SeaStore::Shard::_do_transaction_step(`
`1807`	`1807`	`}`
`1808`	`1808`	`}`
`1809`	`1809`	`return fut.si_then([&, op, this, FNAME](auto get_onode) {`
`1810`		`- OnodeRef &o = onodes[op->oid];`
`1811`		`- if (!o) {`
	`1810`	`+ OnodeRef& onode = onodes[op->oid];`
	`1811`	`+ if (!onode) {`
`1812`	`1812`	`assert(get_onode);`
`1813`		`- o = get_onode;`
	`1813`	`+ onode = get_onode;`
`1814`	`1814`	`}`
`1815`	`1815`	`OnodeRef& d_onode = onodes[op->dest_oid];`
`1816`	`1816`	`if ((op->op == Transaction::OP_CLONE`
`@@ -1833,21 +1833,23 @@ SeaStore::Shard::_do_transaction_step(`
`1833`	`1833`	`}`
`1834`	`1834`	`}).si_then([&ctx, &i, &onodes, op, this, FNAME]() -> tm_ret {`
`1835`	`1835`	`const ghobject_t& oid = i.get_oid(op->oid);`
	`1836`	`+ OnodeRef& onode = onodes[op->oid];`
	`1837`	`+ assert(onode);`
`1836`	`1838`	`try {`
`1837`	`1839`	`switch (op->op) {`
`1838`	`1840`	`case Transaction::OP_REMOVE:`
`1839`	`1841`	`{`
`1840`	`1842`	`DEBUGT("op REMOVE, oid={} ...", *ctx.transaction, oid);`
`1841`		`- return _remove(ctx, onodes[op->oid]`
`1842`		`- ).si_then([&onodes, op] {`
`1843`		`- onodes[op->oid].reset();`
	`1843`	`+ return _remove(ctx, onode`
	`1844`	`+ ).si_then([&onode] {`
	`1845`	`+ onode.reset();`
`1844`	`1846`	`});`
`1845`	`1847`	`}`
`1846`	`1848`	`case Transaction::OP_CREATE:`
`1847`	`1849`	`case Transaction::OP_TOUCH:`
`1848`	`1850`	`{`
`1849`	`1851`	`DEBUGT("op CREATE/TOUCH, oid={} ...", *ctx.transaction, oid);`
`1850`		`- return _touch(ctx, onodes[op->oid]);`
	`1852`	`+ return _touch(ctx, onode);`
`1851`	`1853`	`}`
`1852`	`1854`	`case Transaction::OP_WRITE:`
`1853`	`1855`	`{`
`@@ -1859,14 +1861,14 @@ SeaStore::Shard::_do_transaction_step(`
`1859`	`1861`	`DEBUGT("op WRITE, oid={}, 0x{:x}~0x{:x}, flags=0x{:x} ...",`
`1860`	`1862`	`*ctx.transaction, oid, off, len, fadvise_flags);`
`1861`	`1863`	`return _write(`
`1862`		`- ctx, onodes[op->oid], off, len, std::move(bl),`
	`1864`	`+ ctx, onode, off, len, std::move(bl),`
`1863`	`1865`	`fadvise_flags);`
`1864`	`1866`	`}`
`1865`	`1867`	`case Transaction::OP_TRUNCATE:`
`1866`	`1868`	`{`
`1867`	`1869`	`uint64_t off = op->off;`
`1868`	`1870`	`DEBUGT("op TRUNCATE, oid={}, 0x{:x} ...", *ctx.transaction, oid, off);`
`1869`		`- return _truncate(ctx, onodes[op->oid], off);`
	`1871`	`+ return _truncate(ctx, onode, off);`
`1870`	`1872`	`}`
`1871`	`1873`	`case Transaction::OP_SETATTR:`
`1872`	`1874`	`{`
`@@ -1876,36 +1878,39 @@ SeaStore::Shard::_do_transaction_step(`
`1876`	`1878`	`i.decode_bl(bl);`
`1877`	`1879`	`DEBUGT("op SETATTR, oid={}, attr name={}, value length=0x{:x} ...",`
`1878`	`1880`	`*ctx.transaction, oid, name, bl.length());`
`1879`		`- return _setattrs(ctx, onodes[op->oid], std::move(to_set));`
	`1881`	`+ return _setattrs(ctx, onode, std::move(to_set));`
`1880`	`1882`	`}`
`1881`	`1883`	`case Transaction::OP_SETATTRS:`
`1882`	`1884`	`{`
`1883`	`1885`	`std::map<std::string, bufferlist> to_set;`
`1884`	`1886`	`i.decode_attrset(to_set);`
`1885`	`1887`	`DEBUGT("op SETATTRS, oid={}, attrs size={} ...",`
`1886`	`1888`	`*ctx.transaction, oid, to_set.size());`
`1887`		`- return _setattrs(ctx, onodes[op->oid], std::move(to_set));`
	`1889`	`+ return _setattrs(ctx, onode, std::move(to_set));`
`1888`	`1890`	`}`
`1889`	`1891`	`case Transaction::OP_RMATTR:`
`1890`	`1892`	`{`
`1891`	`1893`	`std::string name = i.decode_string();`
`1892`	`1894`	`DEBUGT("op RMATTR, oid={}, attr name={} ...",`
`1893`	`1895`	`*ctx.transaction, oid, name);`
`1894`		`- return _rmattr(ctx, onodes[op->oid], name);`
	`1896`	`+ return _rmattr(ctx, onode, name);`
`1895`	`1897`	`}`
`1896`	`1898`	`case Transaction::OP_RMATTRS:`
`1897`	`1899`	`{`
`1898`	`1900`	`DEBUGT("op RMATTRS, oid={} ...", *ctx.transaction, oid);`
`1899`		`- return _rmattrs(ctx, onodes[op->oid]);`
	`1901`	`+ return _rmattrs(ctx, onode);`
`1900`	`1902`	`}`
`1901`	`1903`	`case Transaction::OP_OMAP_SETKEYS:`
`1902`	`1904`	`{`
`1903`	`1905`	`std::map<std::string, ceph::bufferlist> aset;`
`1904`	`1906`	`i.decode_attrset(aset);`
`1905`		`- const omap_root_le_t &root = select_log_omap_root(*onodes[op->oid]);`
	`1907`	`+ const omap_root_le_t &root = select_log_omap_root(*onode);`
`1906`	`1908`	`DEBUGT("op OMAP_SETKEYS, oid={}, omap size={}, type={} ...",`
`1907`	`1909`	`*ctx.transaction, oid, aset.size(), root.get_type());`
`1908`		`- return _omap_set_values(ctx, onodes[op->oid], std::move(aset),`
	`1910`	`+ return _omap_set_values(`
	`1911`	`+ ctx,`
	`1912`	`+ onode,`
	`1913`	`+ std::move(aset),`
`1909`	`1914`	`root);`
`1910`	`1915`	`}`
`1911`	`1916`	`case Transaction::OP_OMAP_SETHEADER:`
`@@ -1914,42 +1919,47 @@ SeaStore::Shard::_do_transaction_step(`
`1914`	`1919`	`i.decode_bl(bl);`
`1915`	`1920`	`DEBUGT("op OMAP_SETHEADER, oid={}, length=0x{:x} ...",`
`1916`	`1921`	`*ctx.transaction, oid, bl.length());`
`1917`		`- return _omap_set_header(ctx, onodes[op->oid], std::move(bl));`
	`1922`	`+ return _omap_set_header(ctx, onode, std::move(bl));`
`1918`	`1923`	`}`
`1919`	`1924`	`case Transaction::OP_OMAP_RMKEYS:`
`1920`	`1925`	`{`
`1921`	`1926`	`omap_keys_t keys;`
`1922`	`1927`	`i.decode_keyset(keys);`
`1923`		`- const omap_root_le_t &root = select_log_omap_root(*onodes[op->oid]);`
	`1928`	`+ const omap_root_le_t &root = select_log_omap_root(*onode);`
`1924`	`1929`	`DEBUGT("op OMAP_RMKEYS, oid={}, omap size={}, type={} ...",`
`1925`	`1930`	`*ctx.transaction, oid, keys.size(), root.get_type());`
`1926`		`- return _omap_rmkeys(ctx, onodes[op->oid], std::move(keys), root);`
	`1931`	`+ return _omap_rmkeys(`
	`1932`	`+ ctx,`
	`1933`	`+ onode,`
	`1934`	`+ std::move(keys),`
	`1935`	`+ root);`
`1927`	`1936`	`}`
`1928`	`1937`	`case Transaction::OP_OMAP_RMKEYRANGE:`
`1929`	`1938`	`{`
`1930`	`1939`	`std::string first, last;`
`1931`	`1940`	`first = i.decode_string();`
`1932`	`1941`	`last = i.decode_string();`
`1933`		`- const omap_root_le_t &root = select_log_omap_root(*onodes[op->oid]);`
	`1942`	`+ const omap_root_le_t &root = select_log_omap_root(*onode);`
`1934`	`1943`	`DEBUGT("op OMAP_RMKEYRANGE, oid={}, first={}, last={}, type={}...",`
`1935`	`1944`	`*ctx.transaction, oid, first, last, root.get_type());`
`1936`	`1945`	`return _omap_rmkeyrange(`
`1937`		`- ctx, onodes[op->oid],`
`1938`		`- std::move(first), std::move(last),`
	`1946`	`+ ctx,`
	`1947`	`+ onode,`
	`1948`	`+ std::move(first), std::move(last),`
`1939`	`1949`	`root);`
`1940`	`1950`	`}`
`1941`	`1951`	`case Transaction::OP_OMAP_CLEAR:`
`1942`	`1952`	`{`
`1943`	`1953`	`DEBUGT("op OMAP_CLEAR, oid={} ...", *ctx.transaction, oid);`
`1944`		`- return _omap_clear(ctx, onodes[op->oid]);`
	`1954`	`+ return _omap_clear(ctx, onode);`
`1945`	`1955`	`}`
`1946`	`1956`	`case Transaction::OP_ZERO:`
`1947`	`1957`	`{`
`1948`	`1958`	`objaddr_t off = op->off;`
`1949`	`1959`	`extent_len_t len = op->len;`
`1950`	`1960`	`DEBUGT("op ZERO, oid={}, 0x{:x}~0x{:x} ...",`
`1951`	`1961`	`*ctx.transaction, oid, off, len);`
`1952`		`- return _zero(ctx, onodes[op->oid], off, len);`
	`1962`	`+ return _zero(ctx, onode, off, len);`
`1953`	`1963`	`}`
`1954`	`1964`	`case Transaction::OP_SETALLOCHINT:`
`1955`	`1965`	`{`
`@@ -1978,17 +1988,17 @@ SeaStore::Shard::_do_transaction_step(`
`1978`	`1988`	`{`
`1979`	`1989`	`DEBUGT("op CLONE, oid={}, dest oid={} ...",`
`1980`	`1990`	`*ctx.transaction, oid, i.get_oid(op->dest_oid));`
`1981`		`- return _clone(ctx, onodes[op->oid], onodes[op->dest_oid]);`
	`1991`	`+ return _clone(ctx, onode, onodes[op->dest_oid]);`
`1982`	`1992`	`}`
`1983`	`1993`	`case Transaction::OP_COLL_MOVE_RENAME:`
`1984`	`1994`	`{`
`1985`	`1995`	`DEBUGT("op COLL_MOVE_RENAME, oid={}, dest oid={} ...",`
`1986`	`1996`	`*ctx.transaction, oid, i.get_oid(op->dest_oid));`
`1987`	`1997`	`ceph_assert(op->cid == op->dest_cid);`
`1988`	`1998`	`return _rename(`
`1989`		`- ctx, onodes[op->oid], onodes[op->dest_oid]`
`1990`		`- ).si_then([&onodes, op] {`
`1991`		`- onodes[op->oid].reset();`
	`1999`	`+ ctx, onode, onodes[op->dest_oid]`
	`2000`	`+ ).si_then([&onode] {`
	`2001`	`+ onode.reset();`
`1992`	`2002`	`});`
`1993`	`2003`	`}`
`1994`	`2004`	`default:`