Merge remote-tracking branch 'comm/release/2.6' into jeffolivier/goog…

…le/2.6

Change-Id: If4509d89a75f3bed762804dd52cb1a3c8ae8588a

TAG

@@ -1 +1 @@
-2.6.0-rc1
+2.6.0-rc2

debian/changelog

@@ -1,3 +1,9 @@
+daos (2.6.0-2) unstable; urgency=medium
+  [ Phillip Henderson ]
+  * Second release candidate for 2.6.0
+
+ -- Phillip Henderson <[email protected]>  Wed, 03 Jul 2024 15:43:00 -0500
+
 daos (2.6.0-1) unstable; urgency=medium
   [ Phillip Henderson ]
   * First release candidate for 2.6.0

docs/QSG/setup_rhel.md

@@ -1,9 +1,12 @@
 # DAOS Set-Up on RHEL and Clones
 
-The following instructions detail how to install, set up and start DAOS servers and clients on
-two or more nodes.
-This document includes instructions for RHEL8-compatible distributions. This includes
-RHEL8, Rocky Linux and AlmaLinux.
+The following instructions detail how to install, set up and start DAOS servers
+and clients on two or more nodes.
+This document includes instructions for RHEL8-compatible distributions.
+This includes RHEL8, Rocky Linux 8 and AlmaLinux 8.
+The same instructions also apply to RHEL9-compatible distributions,
+including RHEL9, Rocky Linux 9 and AlmaLinux 9 (replace EL8 by EL9 in
+the description below to use the EL9 packages).
 
 For setup instructions on OpenSuse, refer to [OpenSuse setup](setup_suse.md).
 
@@ -91,6 +94,9 @@ daos-server RPM.
 
 In this section, PMem (Intel(R) Optane(TM) persistent memory) will be prepared and configured to be
 used by DAOS and NVME SSDs will be identified.
+If the DAOS servers do not use Optane Persistent Memory, then please refer to
+[Metadata-on-SSD configuration](https://docs.daos.io/v2.6/admin/deployment/#md-on-ssd-configuration)
+for instructions how to configure the servers without PMem.
 
 1. Prepare the pmem devices on Server nodes:
 

docs/QSG/setup_suse.md

@@ -2,9 +2,9 @@
 
 ## Introduction
 
-The purpose of this guide is to provide a user with a set of command lines to quickly setup and use DAOS with POSIX on openSUSE/SLES 15.3.
+The purpose of this guide is to provide a user with a set of command lines to quickly setup and use DAOS with POSIX on openSUSE/SLES 15.5.
 
-This document covers installation of the DAOS rpms on openSUSE/SLES 15.3 and updating the DAOS configuration files needed by daos servers.
+This document covers installation of the DAOS rpms on openSUSE/SLES 15.5 and updating the DAOS configuration files needed by daos servers.
 
 This guide will also describe how to use dfuse in order to take advantage of DAOS support for POSIX.
 
@@ -21,7 +21,7 @@ This Guide requires a minimum of:
 - 1 server with PMEM and SSDs connected via infiniband storage network.
 - 1 client node.
 - 1 admin node without pmem/ssd but on the infiniband storage network.
-- All nodes have a base openSUSE or SLES 15.3 installed.
+- All nodes have a base openSUSE or SLES 15.5 installed.
 
 Install pdsh on the admin node
 The following steps require two or more hosts which will be divided up
@@ -108,10 +108,9 @@ daos-server RPM.
 
 In this section, PMem (Intel(R) Optane(TM) persistent memory) will be prepared and configured to be
 used by DAOS and NVME SSDs will be identified.
-
-!!! note
-	For OpenSUSE 15.3 installation, update ipmctl to the latest package available from
-        https://build.opensuse.org/package/binaries/hardware:nvdimm/ipmctl/openSUSE_Leap_15.3
+If the DAOS servers do not use Optane Persistent Memory, then please refer to
+[Metadata-on-SSD configuration](https://docs.daos.io/v2.6/admin/deployment/#md-on-ssd-configuration)
+for instructions how to configure the servers without PMem.
 
 1. Prepare the pmem devices on Server nodes:
 

docs/admin/deployment.md

@@ -897,7 +897,7 @@ resetting modules into "MemoryMode" through resource allocations.
 A subsequent reboot is required for BIOS to read the new resource
 allocations.
 
-#### Multiple PMem namespaces per socket (Experimental)
+#### Multiple PMem namespaces per socket
 
 By default the `daos_server scm prepare` command will create one PMem namespace on each PMem
 region.

docs/index.md

@@ -1,4 +1,4 @@
-# Welcome to DAOS Version 2.5!
+# Welcome to DAOS Version 2.6!
 
 The Distributed Asynchronous Object Storage (DAOS) is an open-source
 object store designed from the ground up for massively distributed Non
@@ -15,11 +15,7 @@ In addition to on-prem deployments, DAOS can be deployed in cloud
 environments. More information on cloud deployments is available
 in the [DAOS in the Cloud](./cloud/) section.
 
-The included document versions are associated with DAOS v2.5.
+The included document versions are associated with DAOS v2.6.
 They may also describe features that are currently under development
 for a future DAOS release. Those features will be clearly marked as such.
 
-!!! warning
-    DAOS v2.5 is the (unstable) master branch for DAOS v2.6 development.
-    Use at your own risk. Please consider the [latest](../latest/)
-    stable DAOS release for production deployments.

mkdocs.yml

@@ -1,5 +1,5 @@
 # Project Information
-site_name: DAOS v2.5
+site_name: DAOS v2.6
 site_description: Distributed Asynchronous Object Storage
 site_author: DAOS Project
 
@@ -57,9 +57,9 @@ markdown_extensions:
 nav:
   - Release Information:
       - 'index.md'
-      - 'Release Notes v2.5': 'release/release_notes.md'
-      - 'Support Matrix v2.5': 'release/support_matrix.md'
-      - 'Upgrading to v2.5': 'release/upgrading.md'
+      - 'Release Notes v2.6': 'release/release_notes.md'
+      - 'Support Matrix v2.6': 'release/support_matrix.md'
+      - 'Upgrading to v2.6': 'release/upgrading.md'
   - Overview:
       - 'Architecture': 'overview/architecture.md'
       - 'Storage Model': 'overview/storage.md'
@@ -108,5 +108,5 @@ nav:
       - 'Dev Environment': 'dev/development.md'
       - 'Contributing': 'dev/contributing.md'
       - 'DAOS Internals': 'https://github.com/daos-stack/daos/blob/master/src/README.md'
-      - 'DAOS API Documentation': 'https://docs.daos.io/v2.5/doxygen/html/index.html'
+      - 'DAOS API Documentation': 'https://docs.daos.io/v2.6/doxygen/html/index.html'
       # Attention: Don't change that doxygen path to a relative path, or mkdocs will stumble...

src/cart/utils/memcheck-cart.supp

@@ -628,3 +628,20 @@
    ...
    fun:runtime.persistentalloc
 }
+{
+   go 1.22.3 race
+   Memcheck:Addr8
+   fun:racecallatomic
+}
+{
+   go 1.22.3 race
+   Memcheck:Param
+   read(buf)
+   fun:runtime/internal/syscall.Syscall6
+}
+{
+   go 1.22.3 race
+   Memcheck:Addr4
+   fun:__tsan_go_atomic32_load
+   fun:racecall
+}

utils/rpms/daos.spec

@@ -15,7 +15,7 @@
 
 Name:          daos
 Version:       2.6.0
-Release:       1%{?relval}%{?dist}
+Release:       2%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -590,6 +590,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a shim package
 
 %changelog
+* Wed Jul 03 2024 Phillip Henderson <[email protected]> 2.6.0-2
+- Second release candidate for 2.6.0
+
 * Tue Jun 18 2024 Phillip Henderson <[email protected]> 2.6.0-1
 - First release candidate for 2.6.0