cst/cache: Remove tmp file on put failure

redpanda-data · Nov 4, 2024 · d63c50c · d63c50c
1 parent dfeff1b
commit d63c50c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/v/cloud_storage/cache_service.cc b/src/v/cloud_storage/cache_service.cc
@@ -1304,7 +1304,19 @@ ss::future<> cache::put(
         eptr = std::current_exception();
     }
 
+    // If we failed to write to the tmp file, we should delete it, maybe do an
+    // eager trim, and rethrow the exception.
     if (eptr) {
+        try {
+            co_await delete_file_and_empty_parents(tmp_filepath.native());
+        } catch (...) {
+            vlog(
+              cst_log.error,
+              "Failed to delete tmp file {}: {}",
+              tmp_filepath.native(),
+              std::current_exception());
+        }
+
         if (no_space_on_device) {
             vlog(cst_log.error, "Out of space while writing to cache");
 

diff --git a/src/v/cloud_storage/tests/cache_test.cc b/src/v/cloud_storage/tests/cache_test.cc
@@ -495,10 +495,8 @@ FIXTURE_TEST(test_clean_up_on_stream_exception, cache_test_fixture) {
     BOOST_CHECK_EQUAL(sharded_cache.local().get_usage_bytes(), 0);
     BOOST_CHECK_EQUAL(sharded_cache.local().get_usage_objects(), 0);
 
-    // TODO: This is not expected behavior. The temporary file should be cleaned
-    // up on exception.
     vlog(test_log.info, "Counting files in cache directory");
-    BOOST_CHECK_EQUAL(count_files(CACHE_DIR.native()).get(), 1);
+    BOOST_CHECK_EQUAL(count_files(CACHE_DIR.native()).get(), 0);
 
     vlog(test_log.info, "Test passed");
 }