From: Patrick Donnelly <pdonnell@ibm.com>
Date: Sat, 6 Jun 2026 01:50:19 +0000 (-0400)
Subject: Merge PR #69195 into wip-pdonnell-testing-20260606.015015-main
X-Git-Tag: testing/wip-pdonnell-testing-20260606.015015-main~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3b4a44647dcd12ad00a9ac0693c6d1d8e784200;p=ceph-ci.git

Merge PR #69195 into wip-pdonnell-testing-20260606.015015-main

* refs/pull/69195/head:
	SimpleRADOSStriper: retrieve AIO return values with get_return_value()
---

c3b4a44647dcd12ad00a9ac0693c6d1d8e784200
diff --cc src/SimpleRADOSStriper.cc
index db32237da55,773b08c7fae..ab44946f619
--- a/src/SimpleRADOSStriper.cc
+++ b/src/SimpleRADOSStriper.cc
@@@ -508,16 -307,13 +509,17 @@@ int SimpleRADOSStriper::shrink_alloc(ui
      offset += ext.len;
    }
  
 +  int aio_rc = 0;
    for (auto& aiocp : removes) {
-     if (int rc = aiocp->wait_for_complete(); rc < 0 && rc != -ENOENT) {
+     aiocp->wait_for_complete();
+     if (int rc = aiocp->get_return_value(); rc < 0 && rc != -ENOENT) {
        d(1) << " aio_remove failed: " << cpp_strerror(rc) << dendl;
 -      return rc;
 +      if (aio_rc == 0) aio_rc = rc;
      }
    }
 +  if (aio_rc != 0) {
 +    return aio_rc;
 +  }
  
    auto ext = get_first_extent();
    auto op = librados::ObjectWriteOperation();