1 Star 0 Fork 18

liuh/btrfs-progs

forked from src-openEuler/btrfs-progs 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0001-fix-exclusive-op-enqueue-timeout.patch 2.67 KB
一键复制 编辑 原始数据 按行查看 历史
cenhuilin 提交于 2024-04-19 10:33 . fix exclusive op enqueue timeout
From d03594b0313db71413b9dcb040f8d5c4da7213b1 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Thu, 18 Apr 2024 18:24:48 +0800
Subject: [PATCH] fix exclusive op enqueue timeout
There's a report that 'btrfs balance start --enqueue' does not properly
wait when there are multiple instances started. The command does a busy
wait instead of timeouts.
Strace output:
0.000006 pselect6(5, NULL, NULL, [4], {tv_sec=60, tv_nsec=0}, NULL) = 1 (except [4], left {tv_sec=59, tv_nsec=999999716})
0.000008 pselect6(5, NULL, NULL, [4], {tv_sec=29, tv_nsec=999999000}, NULL) = 1 (except [4], left {tv_sec=29, tv_nsec=999998786})
After the first select there's almost the entire time left, the second
one starts right after it.
Polling/selecting sysfs files is possible under some conditions:
- the file descriptor must be reopened before each poll/select
- the whole buffer must be read too
With that in place it now works as expected. The remaining timeout logic
is slightly adjusted to wait at most 10 seconds so the pending jobs do
not wait too long if there's still a lot of time left from the first
select.
Issue: #746
Signed-off-by: David Sterba <dsterba@suse.com>
---
common/utils.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/common/utils.c b/common/utils.c
index 62f0e3f..7cde492 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -1326,26 +1326,45 @@ int check_running_fs_exclop(int fd, enum exclusive_operation start, bool enqueue
fflush(stdout);
}
+ /*
+ * The sysfs file descriptor needs to be reopened and all data read
+ * before each select().
+ */
while (exclop > 0) {
fd_set fds;
struct timeval tv = { .tv_sec = 60, .tv_usec = 0 };
+ char tmp[1024];
+ close(sysfs_fd);
+ sysfs_fd = sysfs_open_fsid_file(fd, "exclusive_operation");
+ if (sysfs_fd < 0)
+ return sysfs_fd;
FD_ZERO(&fds);
FD_SET(sysfs_fd, &fds);
+ ret = read(sysfs_fd, tmp, sizeof(tmp));
ret = select(sysfs_fd + 1, NULL, NULL, &fds, &tv);
if (ret < 0) {
ret = -errno;
break;
}
if (ret > 0) {
+ close(sysfs_fd);
+ sysfs_fd = sysfs_open_fsid_file(fd, "exclusive_operation");
+ if (sysfs_fd < 0)
+ return sysfs_fd;
+
+ FD_ZERO(&fds);
+ FD_SET(sysfs_fd, &fds);
+
+ ret = read(sysfs_fd, tmp, sizeof(tmp));
/*
* Notified before the timeout, check again before
* returning. In case there are more operations
* waiting, we want to reduce the chances to race so
* reuse the remaining time to randomize the order.
*/
- tv.tv_sec /= 2;
+ tv.tv_sec = (tv.tv_sec % 10) + 1;
ret = select(sysfs_fd + 1, NULL, NULL, &fds, &tv);
exclop = get_fs_exclop(fd);
if (exclop <= 0)
--
2.43.0
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/liuh0329/btrfs-progs.git
git@gitee.com:liuh0329/btrfs-progs.git
liuh0329
btrfs-progs
btrfs-progs
master

搜索帮助

0d507c66 1850385 C8b1a773 1850385