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.

Sign up for GitHub

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

DAOS-14491: Retain support for phase-1 DAV heap #13158

Merged
merged 4 commits into from
Oct 25, 2023
Merged

DAOS-14491: Retain support for phase-1 DAV heap #13158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a0bede
DAOS-14491: Retain support for phase-1 DAV heap
sherintg Oct 16, 2023
0f3d386
DAOS-14491: Retain support for phase-1 DAV heap
sherintg Oct 18, 2023
3a4df68
Merge branch 'feature/vos_on_blob_p2' into sherintg/vos_on_blob_p2/DA…
sherintg Oct 19, 2023
ee2f2e8
DAOS-14491: Retain support for phase-1 DAV heap
sherintg Oct 19, 2023
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ pipeline {
}
steps {
job_step_update(
unitTest(timeout_time: 60,
unitTest(timeout_time: 120,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the change for?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am running vos_tests -A 50 and bio_ut twice now. Once with default bmem and the second time with v2 bmem. Please refer changes to utils/utest.yaml

unstash_opt: true,
ignore_failure: true,
inst_repos: prRepos(),
Expand Down
7 changes: 7 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
daos (2.5.100-10) unstable; urgency=medium

[ Sherin T George ]
* Add DAV v2 lib

-- Sherin T George <sherin-t.george@hpe.com> Mon, 16 Oct 2023 11:54:00 +0530

daos (2.5.100-9) unstable; urgency=medium

[ Brian J. Murrell ]
Expand Down
1 change: 1 addition & 0 deletions debian/daos-server.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ usr/lib64/daos_srv/libbio.so
usr/lib64/daos_srv/libplacement.so
usr/lib64/daos_srv/libpipeline.so
usr/lib64/libdaos_common_pmem.so
usr/lib64/libdav_v2.so
usr/share/daos/control/setup_spdk.sh
usr/lib/systemd/system/daos_server.service
usr/lib/sysctl.d/10-daos_server.conf
Expand Down
3 changes: 2 additions & 1 deletion src/common/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def build_daos_common(denv, client):
'dav/ravl_interval.c', 'dav/recycler.c', 'dav/stats.c', 'dav/tx.c', 'dav/ulog.c',
'dav/util.c', 'dav/wal_tx.c']
ad_mem_files = ['ad_mem.c', 'ad_tx.c']
common_libs.extend(['pmemobj', 'abt'])
common_libs.extend(['pmemobj', 'abt', 'dav_v2'])
benv.AppendUnique(RPATH_FULL=['$PREFIX/lib64/daos_srv'])
benv.Append(CPPDEFINES=['-DDAOS_PMEM_BUILD'])
benv.Append(OBJPREFIX="v_")
Expand All @@ -51,6 +51,7 @@ def scons():
"""Execute build"""
Import('env', 'base_env', 'prereqs')

SConscript('dav_v2/SConscript')
env.AppendUnique(LIBPATH=[Dir('.')])
base_env.AppendUnique(LIBPATH=[Dir('.')])
base_env.d_add_build_rpath()
Expand Down
23 changes: 9 additions & 14 deletions src/common/dav/bucket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@

struct bucket {
/* this struct is both the lock guard and the locked state */
struct bucket_locked *locked;
struct alloc_class *aclass;
struct block_container *container;
struct bucket_locked *locked;

struct alloc_class *aclass;

struct block_container *container;
const struct block_container_ops *c_ops;
struct memory_block_reserved *active_memory_block;
struct zoneset *zset;
int is_active;

struct memory_block_reserved *active_memory_block;
int is_active;
};

struct bucket_locked {
Expand Down Expand Up @@ -75,7 +77,7 @@ bucket_fini(struct bucket *b)
* bucket_locked_new -- creates a new locked bucket instance
*/
struct bucket_locked *
bucket_locked_new(struct block_container *c, struct alloc_class *aclass, struct zoneset *zset)
bucket_locked_new(struct block_container *c, struct alloc_class *aclass)
{
ASSERTne(c, NULL);

Expand All @@ -90,7 +92,6 @@ bucket_locked_new(struct block_container *c, struct alloc_class *aclass, struct

util_mutex_init(&b->lock);
b->bucket.locked = b;
b->bucket.zset = zset;

return b;

Expand Down Expand Up @@ -267,9 +268,3 @@ bucket_active_block(struct bucket *b)
{
return b->is_active ? b->active_memory_block : NULL;
}

struct zoneset *
bucket_get_zoneset(struct bucket *b)
{
return b->zset;
}
6 changes: 2 additions & 4 deletions src/common/dav/bucket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
struct bucket_locked;
struct bucket;

struct bucket_locked *
bucket_locked_new(struct block_container *c, struct alloc_class *aclass, struct zoneset *zset);
struct bucket_locked *bucket_locked_new(struct block_container *c,
struct alloc_class *aclass);

struct bucket *bucket_acquire(struct bucket_locked *b);
void bucket_release(struct bucket *b);
Expand All @@ -41,7 +41,5 @@ int bucket_detach_run(struct bucket *b,
struct memory_block_reserved *bucket_active_block(struct bucket *b);

void bucket_locked_delete(struct bucket_locked *b);
struct zoneset *
bucket_get_zoneset(struct bucket *b);

#endif /* __DAOS_COMMON_BUCKET_H */
Loading