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

Addressed review comments and increased the timeout of bdev unit test with memcheck to accomodate new tests added. Signed-off-by: Sherin T George <sherin-t.george@hpe.com>
daos-stack · Oct 18, 2023 · 0f3d386 · 0f3d386
1 parent 4a0bede
commit 0f3d386
Show file tree

Hide file tree

Showing 49 changed files with 49 additions and 49 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -956,7 +956,7 @@ pipeline {
                     }
                     steps {
                         job_step_update(
-                            unitTest(timeout_time: 60,
+                            unitTest(timeout_time: 120,
                                      unstash_opt: true,
                                      ignore_failure: true,
                                      inst_repos: prRepos(),

diff --git a/src/common/dav/bucket.c b/src/common/dav/bucket.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * bucket.c -- bucket implementation

diff --git a/src/common/dav/bucket.h b/src/common/dav/bucket.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2021, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * bucket.h -- internal definitions for bucket

diff --git a/src/common/dav/dav.h b/src/common/dav/dav.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * dav_flags.h -- Interfaces exported by DAOS internal Allocator for VOS (DAV)

diff --git a/src/common/dav/dav_internal.h b/src/common/dav/dav_internal.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * dav_flags.h -- Interfaces exported by DAOS internal Allocator for VOS (DAV)

diff --git a/src/common/dav/heap.c b/src/common/dav/heap.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * heap.c -- heap implementation

diff --git a/src/common/dav/heap.h b/src/common/dav/heap.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2021, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * heap.h -- internal definitions for heap

diff --git a/src/common/dav/obj.h b/src/common/dav/obj.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2014-2021, Intel Corporation */
+/* Copyright 2014-2023, Intel Corporation */
 
 /*
  * obj.h -- internal definitions for obj module

diff --git a/src/common/dav/palloc.c b/src/common/dav/palloc.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * palloc.c -- implementation of pmalloc POSIX-like API

diff --git a/src/common/dav/palloc.h b/src/common/dav/palloc.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2020, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * palloc.h -- internal definitions for persistent allocator

diff --git a/src/common/dav/recycler.c b/src/common/dav/recycler.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2022, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * recycler.c -- implementation of run recycler

diff --git a/src/common/dav/recycler.h b/src/common/dav/recycler.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2021, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * recycler.h -- internal definitions of run recycler

diff --git a/src/common/dav/tx.c b/src/common/dav/tx.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * tx.c -- transactions implementation

diff --git a/src/common/dav_v2/README.md b/src/common/dav_v2/README.md
@@ -1,6 +1,6 @@
 # DAOS Allocator for VOS
 
-The DAV alloctor for md_on_ssd phase 2 now supports evictable zones. This introduces change in the
+The DAV allocator for md_on_ssd phase 2 now supports evictable zones. This introduces change in the
 layout of heap and is not compatible with the DAV allocator of phase 1. In order to support both
 layouts the new allocator is packaged as a different library and linked to daos_common_pmem
 library.
diff --git a/src/common/dav_v2/alloc_class.c b/src/common/dav_v2/alloc_class.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2022, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * alloc_class.c -- implementation of allocation classes

diff --git a/src/common/dav_v2/alloc_class.h b/src/common/dav_v2/alloc_class.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2020, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * alloc_class.h -- internal definitions for allocation classes

diff --git a/src/common/dav_v2/container.h b/src/common/dav_v2/container.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2020, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * container.h -- internal definitions for block containers

diff --git a/src/common/dav_v2/container_ravl.c b/src/common/dav_v2/container_ravl.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2018-2022, Intel Corporation */
+/* Copyright 2018-2023, Intel Corporation */
 
 /*
  * container_ravl.c -- implementation of ravl-based block container

diff --git a/src/common/dav_v2/container_seglists.c b/src/common/dav_v2/container_seglists.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * container_seglists.c -- implementation of segregated lists block container

diff --git a/src/common/dav_v2/critnib.c b/src/common/dav_v2/critnib.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2018-2022, Intel Corporation */
+/* Copyright 2018-2023, Intel Corporation */
 
 /*
  * critnib.c -- implementation of critnib tree

diff --git a/src/common/dav_v2/critnib.h b/src/common/dav_v2/critnib.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2018-2020, Intel Corporation */
+/* Copyright 2018-2023, Intel Corporation */
 
 /*
  * critnib.h -- internal definitions for critnib tree

diff --git a/src/common/dav_v2/dav_clogs.c b/src/common/dav_v2/dav_clogs.c
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2015-2022 Intel Corporation.
+ * (C) Copyright 2015-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */

diff --git a/src/common/dav_v2/dav_clogs.h b/src/common/dav_v2/dav_clogs.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * dav_iface.h -- Interfaces exported by DAOS internal Allocator for VOS (DAV)

diff --git a/src/common/dav_v2/dav_internal.h b/src/common/dav_v2/dav_internal.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * dav_flags.h -- Interfaces exported by DAOS internal Allocator for VOS (DAV)

diff --git a/src/common/dav_v2/heap_layout.h b/src/common/dav_v2/heap_layout.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2020, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * heap_layout.h -- internal definitions for heap layout

diff --git a/src/common/dav_v2/memblock.c b/src/common/dav_v2/memblock.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2021, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * memblock.c -- implementation of memory block

diff --git a/src/common/dav_v2/memblock.h b/src/common/dav_v2/memblock.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2021, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * memblock.h -- internal definitions for memory block

diff --git a/src/common/dav_v2/memops.c b/src/common/dav_v2/memops.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2022, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * memops.c -- aggregated memory operations helper implementation

diff --git a/src/common/dav_v2/memops.h b/src/common/dav_v2/memops.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2020, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * memops.h -- aggregated memory operations helper definitions

diff --git a/src/common/dav_v2/mo_wal.h b/src/common/dav_v2/mo_wal.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2020, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 #ifndef __DAOS_COMMON_MO_WAL_H
 #define __DAOS_COMMON_MO_WAL_H 1

diff --git a/src/common/dav_v2/out.h b/src/common/dav_v2/out.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2014-2021, Intel Corporation */
+/* Copyright 2014-2023, Intel Corporation */
 
 /*
  * out.h -- definitions for "out" module

diff --git a/src/common/dav_v2/palloc.h b/src/common/dav_v2/palloc.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2020, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * palloc.h -- internal definitions for persistent allocator

diff --git a/src/common/dav_v2/ravl.c b/src/common/dav_v2/ravl.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2018-2022, Intel Corporation */
+/* Copyright 2018-2023, Intel Corporation */
 
 /*
  * ravl.c -- implementation of a RAVL tree

diff --git a/src/common/dav_v2/ravl.h b/src/common/dav_v2/ravl.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2018-2021, Intel Corporation */
+/* Copyright 2018-2023, Intel Corporation */
 
 /*
  * ravl.h -- internal definitions for ravl tree

diff --git a/src/common/dav_v2/ravl_interval.c b/src/common/dav_v2/ravl_interval.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2020-2022, Intel Corporation */
+/* Copyright 2020-2023, Intel Corporation */
 
 /*
  * ravl_interval.c -- ravl_interval implementation

diff --git a/src/common/dav_v2/ravl_interval.h b/src/common/dav_v2/ravl_interval.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2020-2021, Intel Corporation */
+/* Copyright 2020-2023, Intel Corporation */
 
 /*
  * ravl_interval.h -- internal definitions for ravl_interval

diff --git a/src/common/dav_v2/stats.c b/src/common/dav_v2/stats.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2017-2021, Intel Corporation */
+/* Copyright 2017-2023, Intel Corporation */
 
 /*
  * stats.c -- implementation of statistics

diff --git a/src/common/dav_v2/stats.h b/src/common/dav_v2/stats.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2017-2021, Intel Corporation */
+/* Copyright 2017-2023, Intel Corporation */
 
 /*
  * stats.h -- definitions of statistics

diff --git a/src/common/dav_v2/sys_util.h b/src/common/dav_v2/sys_util.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2020, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * sys_util.h -- internal utility wrappers around system functions

diff --git a/src/common/dav_v2/tx.h b/src/common/dav_v2/tx.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2016-2020, Intel Corporation */
+/* Copyright 2016-2023, Intel Corporation */
 
 /*
  * tx.h -- internal definitions for transactions

diff --git a/src/common/dav_v2/ulog.c b/src/common/dav_v2/ulog.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2022, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * ulog.c -- unified log implementation

diff --git a/src/common/dav_v2/ulog.h b/src/common/dav_v2/ulog.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2021, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * ulog.h -- unified log public interface

diff --git a/src/common/dav_v2/util.c b/src/common/dav_v2/util.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2014-2022, Intel Corporation */
+/* Copyright 2014-2023, Intel Corporation */
 
 /*
  * util.c -- very basic utilities

diff --git a/src/common/dav_v2/util.h b/src/common/dav_v2/util.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2014-2021, Intel Corporation */
+/* Copyright 2014-2023, Intel Corporation */
 /*
  * Copyright (c) 2016-2020, Microsoft Corporation. All rights reserved.
  *

diff --git a/src/common/dav_v2/valgrind_internal.h b/src/common/dav_v2/valgrind_internal.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2015-2021, Intel Corporation */
+/* Copyright 2015-2023, Intel Corporation */
 
 /*
  * valgrind_internal.h -- internal definitions for valgrind macros

diff --git a/src/common/dav_v2/vec.h b/src/common/dav_v2/vec.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2017-2020, Intel Corporation */
+/* Copyright 2017-2023, Intel Corporation */
 
 /*
  * vec.h -- vector interface

diff --git a/src/common/dav_v2/vecq.h b/src/common/dav_v2/vecq.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
-/* Copyright 2018-2020, Intel Corporation */
+/* Copyright 2018-2023, Intel Corporation */
 
 /*
  * vecq.h -- vector queue (FIFO) interface

diff --git a/src/common/dav_v2/wal_tx.h b/src/common/dav_v2/wal_tx.h
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2021-2022 Intel Corporation.
+ * (C) Copyright 2021-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */

diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec
@@ -586,7 +586,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a shim package
 
 %changelog
-* Wed Oct 16 2023 Sherin T George <sherin-t.george@hpe.com> 2.5.100-10
+* Mon Oct 16 2023 Sherin T George <sherin-t.george@hpe.com> 2.5.100-10
 - The modified DAV allocator with memory bucket support for md_on_ssd
   phase-2 is delivered as dav_v2.so.