From cb437913d3d0e89a759c2f2c650b90d4d0a1f441 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 12 Dec 2022 00:15:32 +0300 Subject: [PATCH] Never try to wait for free space inside blockstore --- src/blockstore_impl.cpp | 11 ----------- src/blockstore_impl.h | 2 -- src/blockstore_write.cpp | 6 ------ 3 files changed, 19 deletions(-) diff --git a/src/blockstore_impl.cpp b/src/blockstore_impl.cpp index dfb0835b..7e7748d7 100644 --- a/src/blockstore_impl.cpp +++ b/src/blockstore_impl.cpp @@ -306,17 +306,6 @@ void blockstore_impl_t::check_wait(blockstore_op_t *op) // do not submit #ifdef BLOCKSTORE_DEBUG printf("Still waiting for a journal buffer\n"); -#endif - return; - } - PRIV(op)->wait_for = 0; - } - else if (PRIV(op)->wait_for == WAIT_FREE) - { - if (!data_alloc->get_free_count() && flusher->is_active()) - { -#ifdef BLOCKSTORE_DEBUG - printf("Still waiting for free space on the data device\n"); #endif return; } diff --git a/src/blockstore_impl.h b/src/blockstore_impl.h index d1bcab38..89064179 100644 --- a/src/blockstore_impl.h +++ b/src/blockstore_impl.h @@ -160,8 +160,6 @@ struct __attribute__((__packed__)) dirty_entry #define WAIT_JOURNAL 3 // Suspend operation until the next journal sector buffer is free #define WAIT_JOURNAL_BUFFER 4 -// Suspend operation until there is some free space on the data device -#define WAIT_FREE 5 struct fulfill_read_t { diff --git a/src/blockstore_write.cpp b/src/blockstore_write.cpp index b948fc4e..607d4563 100644 --- a/src/blockstore_write.cpp +++ b/src/blockstore_write.cpp @@ -261,12 +261,6 @@ int blockstore_impl_t::dequeue_write(blockstore_op_t *op) if (loc == UINT64_MAX) { // no space - if (flusher->is_active()) - { - // hope that some space will be available after flush - PRIV(op)->wait_for = WAIT_FREE; - return 0; - } cancel_all_writes(op, dirty_it, -ENOSPC); return 2; }