Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patches series for dfuse #15645

Merged
merged 33 commits into from
Dec 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1518ea8
DAOS-15682 dfuse: Perform reads in larger chunks. (#14212)
ashleypittman Sep 26, 2024
a34691b
DAOS-16729 dfuse: Remove deprecated single-threaded option. (#15345)
ashleypittman Nov 4, 2024
ded7560
DAOS-16736 dfuse: Add a common struct for active IE data. (#15362)
ashleypittman Nov 8, 2024
6abf25a
DAOS-16686 dfuse: Move pre-read code to inode from file handle. (#15488)
ashleypittman Nov 15, 2024
e644113
DAOS-16686 dfuse: Fix overlapping chunk reads
wangdi1 Dec 18, 2024
fd27521
DAOS-16686 dfuse: Detect matching reads to avoid network access
wangdi1 Dec 18, 2024
ae9b786
DAOS-15626 dfuse: Improve linear-read detection code
wangdi1 Dec 18, 2024
fbe5483
DAOS-16686 dfuse: avoid duplicate RPC between readahead and read
wangdi1 Dec 18, 2024
58a2513
DAOS-16686 dfuse: set time for new created entry
wangdi1 Dec 18, 2024
cc1b504
DAOS-16686 dfuse: optimize open
wangdi1 Dec 18, 2024
866f078
DAOS-16686 dfuse: use chan patch to avoid some contention
wangdi1 Dec 18, 2024
a331daa
DAOS-16686 dfuse: force readdir plus for all cases temporarily
wangdi1 Dec 18, 2024
3309425
DAOS-16686 dfuse: read from cache for readahead
wangdi1 Dec 18, 2024
a101c88
DAOS-16686 dfuse: fix style
wangdi1 Dec 18, 2024
463edf3
DAOS-16686 dfuse: fix style
wangdi1 Dec 18, 2024
fcdc58c
Merge remote-tracking branch 'refs/remotes/origin/wangdi/google_26_df…
wangdi1 Dec 18, 2024
683d317
DAOS-16686 dfuse: revert chan patch
wangdi1 Dec 18, 2024
687c74b
Run-GHA: true
wangdi1 Dec 20, 2024
ede7e64
DAOS-16686 dfuse: various fixes
wangdi1 Dec 21, 2024
40755d7
DAOS-16686 dfuse: various fixes
wangdi1 Dec 21, 2024
6f0eba8
Merge remote-tracking branch 'refs/remotes/origin/wangdi/google_26_df…
wangdi1 Dec 22, 2024
5a9b03b
DAOS-16686 dfuse: a few fixes for cleanup
wangdi1 Dec 23, 2024
8840964
DAOS-16686 dfuse: fix style
wangdi1 Dec 23, 2024
81f5ff4
DAOS-16686 dfuse: fix hang for chunk read
wangdi1 Dec 24, 2024
9d30f9f
DAOS-16686 dfuse: fix style
wangdi1 Dec 25, 2024
67e1e6c
DAOS-16686 dfuse: fix the typo in utils test
wangdi1 Dec 28, 2024
77643c9
DAOS-16686 dfuse: fix the typo in utils test
wangdi1 Dec 28, 2024
26f3696
Merge remote-tracking branch 'refs/remotes/origin/wangdi/google_26_df…
wangdi1 Dec 28, 2024
9d681a4
DAOS-16686 dfuse: fix the memory leak
wangdi1 Dec 28, 2024
651ba04
DAOS-16686 dfuse: fix style
wangdi1 Dec 28, 2024
c01a526
Merge branch 'wangdi/google_26' into wangdi/google_26_dfuse
wangdi1 Dec 28, 2024
8af7463
Merge branch 'wangdi/google_26' into wangdi/google_26_dfuse
wangdi1 Dec 28, 2024
c171530
Merge remote-tracking branch 'refs/remotes/origin/wangdi/google_26_df…
wangdi1 Dec 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
DAOS-16686 dfuse: revert chan patch
Revert chan patch, since building RPM will fail with this patch.

Run-GHA: true
Allow-unstable-test: true
Required-githooks: true
Signed-off-by: Di Wang <[email protected]>
wangdi1 committed Dec 18, 2024
commit 683d3175340588394c4c6675d2827384d8d3b27f
9 changes: 3 additions & 6 deletions src/client/dfuse/dfuse_thread.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* (C) Copyright 2020-2024 Intel Corporation.
* (C) Copyright 2020-2023 Intel Corporation.
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
@@ -34,11 +34,10 @@ dfuse_do_work(void *arg)
struct dfuse_thread *dt = arg;
struct dfuse_tm *dtm = dt->dt_tm;
int rc;
struct fuse_chan *chan = fuse_clone_chan(dtm->tm_se);

while (!fuse_session_exited(dtm->tm_se)) {
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
rc = fuse_session_receive_buf_chan(dtm->tm_se, &dt->dt_fbuf, chan);
rc = fuse_session_receive_buf(dtm->tm_se, &dt->dt_fbuf);
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
if (rc == -EINTR)
continue;
@@ -53,11 +52,9 @@ dfuse_do_work(void *arg)
if (atomic_load_relaxed(&dtm->tm_exit))
return NULL;

fuse_session_process_buf_chan(dtm->tm_se, &dt->dt_fbuf, chan);
fuse_session_process_buf(dtm->tm_se, &dt->dt_fbuf);
}

fuse_chan_put(chan);

sem_post(&dtm->tm_finish);

return NULL;
4 changes: 2 additions & 2 deletions utils/build.config
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ component=daos

[commit_versions]
argobots=v1.1
fuse=a6a219f5344a5c09cec34416818342ac220a0df2
fuse=fuse-3.16.2
pmdk=2.1.0
isal=v2.30.0
isal_crypto=v2.23.0
@@ -27,6 +27,6 @@ ucx=https://github.com/openucx/ucx.git

[patch_versions]
spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff
fuse=https://patch-diff.githubusercontent.com/raw/ashleypittman/fused/pull/1.patch
fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff
mercury=https://raw.githubusercontent.com/daos-stack/mercury/f3dc286fb40ec1a3a38a2e17c45497bc2aa6290d/na_ucx.patch
pmdk=https://github.com/pmem/pmdk/commit/2abe15ac0b4eed894b6768cd82a3b0a7c4336284.diff