Skip to content

Commit

Permalink
DAOS-623 build: bump version to 2.3.108 (#12288)
Browse files Browse the repository at this point in the history
REBASE AND LAND TO RELEASE/2.4 AFTER CREATION

Bump the version  to 2.3.108 now that the release branch has been
created.
Adjust Jenkinsfile accordingly.
Fix a few links in the documentation that point to master branch.

Signed-off-by: Jeff Olivier <[email protected]>
  • Loading branch information
jolivier23 authored Jun 7, 2023
1 parent b91909e commit 7f4ca09
Show file tree
Hide file tree
Showing 22 changed files with 58 additions and 56 deletions.
6 changes: 2 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Map nlt_test() {
}

// For master, this is just some wildly high number
String next_version = '1000'
String next_version = '2.5.0'

// Don't define this as a type or it loses it's global scope
target_branch = env.CHANGE_TARGET ? env.CHANGE_TARGET : env.BRANCH_NAME
Expand Down Expand Up @@ -160,9 +160,7 @@ pipeline {

triggers {
/* groovylint-disable-next-line AddEmptyString */
cron(env.BRANCH_NAME == 'master' ? 'TZ=UTC\n0 0 * * *\n' : '' +
/* groovylint-disable-next-line AddEmptyString */
env.BRANCH_NAME == 'weekly-testing' ? 'H 0 * * 6' : '')
cron(env.BRANCH_NAME == 'release/2.4' ? 'TZ=America/Toronto\n0 12 * * *\n' : '')
}

environment {
Expand Down
2 changes: 1 addition & 1 deletion TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.107-tb
2.3.108-tb
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.107
2.3.108
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.3.108-1) unstable; urgency=medium
[ Jeff Olivier ]
* Bump version to 2.3.108

-- Jeff Olivier <[email protected]> Tue, 06 Jun 2023 16:40:00 -0600

daos (2.3.107-7) unstable; urgency=medium
[ Jerome Soumagne ]
* Remove libfabric pinning and allow for 1.18 builds
Expand Down
10 changes: 5 additions & 5 deletions docs/QSG/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ $ cat /proc/meminfo | grep -e "^Huge"
The platform was tested and validated with the following dependencies:
- [Docker CE](https://docs.docker.com/engine/install/centos/) latest
[RPMs](https://download.docker.com/linux/centos/docker-ce.repo)
- [DAOS 2.3](https://docs.daos.io/v2.3/) local RPMS builds from [DAOS master
branch](https://github.com/daos-stack/daos/tree/master)
- [DAOS 2.3](https://docs.daos.io/v2.3/) local RPMS builds from [DAOS release/2.4
branch](https://github.com/daos-stack/daos/tree/release/2.4)
- [rockylinux/rockylinux:8.6](https://hub.docker.com/r/rockylinux/rockylinux/) official docker
images.

Expand Down Expand Up @@ -80,7 +80,7 @@ from GitHub with the following command:

```bash
$ docker build --tag daos-base:rocky8.6 \
https://github.com/daos-stack/daos.git#master:utils/docker/vcluster/daos-base/el8
https://github.com/daos-stack/daos.git#release/2.4:utils/docker/vcluster/daos-base/el8
```

This Docker file accept the following arguments:
Expand All @@ -102,7 +102,7 @@ following command:

```bash
$ docker build --tag daos-base:rocky8.6 --build-arg DAOS_AUTH=no \
https://github.com/daos-stack/daos.git#master:utils/docker/vcluster/daos-base/el8
https://github.com/daos-stack/daos.git#release/2.4:utils/docker/vcluster/daos-base/el8
```

It is also possible to build the `daos-base` image from a local tree with the following command:
Expand Down Expand Up @@ -130,7 +130,7 @@ to build directly the three images from GitHub:
```bash
$ for image in daos-server daos-admin daos-client ; do \
docker build --tag "$image:rocky8.6" \
"https://github.com/daos-stack/daos.git#master:utils/docker/vcluster/$image/el8"; \
"https://github.com/daos-stack/daos.git#release/2.4:utils/docker/vcluster/$image/el8"; \
done
```

Expand Down
2 changes: 1 addition & 1 deletion docs/QSG/setup_suse.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ for more information.
## Create Configuration Files

In this section the `daos_server`, `daos_agent`, and dmg command configuration files will be defined.
Examples are available on [github](https://github.com/daos-stack/daos/tree/master/utils/config/examples).
Examples are available on [github](https://github.com/daos-stack/daos/tree/release/2.4/utils/config/examples).

1. Determine the addresses for the NVMe devices on the server
nodes:
Expand Down
6 changes: 3 additions & 3 deletions docs/admin/administration.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ pool component values specified in
are per rank.
If multiple ranks (I/O processes) have been configured per host in the server
configuration file
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/master/utils/config/daos_server.yml)
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_server.yml)
then the values supplied to `dmg pool create` should be
a maximum of the SCM/NVMe free space divided by the number of ranks per host.

Expand Down Expand Up @@ -715,12 +715,12 @@ removed and storage wiped.
System commands will be handled by a DAOS Server acting as access point and
listening on the address specified in the DMG config file "hostlist" parameter.
See
[`daos_control.yml`](https://github.com/daos-stack/daos/blob/master/utils/config/daos_control.yml)
[`daos_control.yml`](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_control.yml)
for details.
At least one of the addresses in the hostlist parameters should match one of the
"access point" addresses specified in the server config file
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/master/utils/config/daos_server.yml)
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_server.yml)
that is supplied when starting `daos_server` instances.
- Commands used to manage a DAOS System:
Expand Down
20 changes: 10 additions & 10 deletions docs/admin/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ The configuration file location can be specified on the command line
(`/etc/daos/daos_server.yml`).

Parameter descriptions are specified in
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/master/utils/config/daos_server.yml)
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_server.yml)
and example configuration files in the
[examples](https://github.com/daos-stack/daos/tree/master/utils/config/examples)
[examples](https://github.com/daos-stack/daos/tree/release/2.4/utils/config/examples)
directory.

Any option supplied to `daos_server` as a command line option or flag will
Expand All @@ -90,14 +90,14 @@ file for reference, and the location will be written to the log.
The example configuration file lists the default empty configuration, listing
all the options (living documentation of the config file). Live examples are
available at
<https://github.com/daos-stack/daos/tree/master/utils/config/examples>
<https://github.com/daos-stack/daos/tree/release/2.4/utils/config/examples>

The location of this configuration file is determined by first checking
for the path specified through the -o option of the `daos_server` command
line, if unspecified then `/etc/daos/daos_server.yml` is used.

Refer to the example configuration file
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/master/utils/config/daos_server.yml)
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_server.yml)
for latest information and examples.

#### Auto Generate Configuration File
Expand Down Expand Up @@ -643,7 +643,7 @@ To set the addresses of which DAOS Servers to task, provide either:
- `-l <hostlist>` on the commandline when invoking, or

- `hostlist: <hostlist>` in the control configuration file
[`daos_control.yml`](https://github.com/daos-stack/daos/blob/master/utils/config/daos_control.yml)
[`daos_control.yml`](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_control.yml)

Where `<hostlist>` represents a slurm-style hostlist string e.g.
`foo-1[28-63],bar[256-511]`.
Expand Down Expand Up @@ -1094,9 +1094,9 @@ For class == "nvme", the following parameters should be populated:
will assign them. Otherwise all roles must be assigned to a tier.

See the sample configuration file
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/master/utils/config/daos_server.yml)
[`daos_server.yml`](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_server.yml)
and example configuration files in the
[examples](https://github.com/daos-stack/daos/tree/master/utils/config/examples)
[examples](https://github.com/daos-stack/daos/tree/release/2.4/utils/config/examples)
directory for more details.

The default way for DAOS to access NVMe storage is through SPDK via the VFIO user-space driver.
Expand Down Expand Up @@ -1462,7 +1462,7 @@ is used unless the `ExecStart` line in the `daos_agent.service` file is
modified to include the `-o` option.

Parameter descriptions are specified in the sample
[daos\_agent.yml](https://github.com/daos-stack/daos/blob/master/utils/config/daos_agent.yml)
[daos\_agent.yml](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_agent.yml)
file, which will also get installed into `/etc/daos/daos_agent.yml`
during the installation of the daos-client RPM.

Expand Down Expand Up @@ -1578,11 +1578,11 @@ the `[Service]` section before reloading systemd and restarting the

[^1]: https://github.com/intel/ipmctl

[^2]: https://github.com/daos-stack/daos/tree/master/utils/config
[^2]: https://github.com/daos-stack/daos/tree/release/2.4/utils/config

[^3]: [https://www.open-mpi.org/faq/?category=running\#mpirun-hostfile](https://www.open-mpi.org/faq/?category=running#mpirun-hostfile)

[^4]: https://github.com/daos-stack/daos/tree/master/src/control/README.md
[^4]: https://github.com/daos-stack/daos/tree/release/2.4/src/control/README.md

[^5]: https://github.com/pmem/ndctl/issues/130

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/performance_tuning.md
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ is enabled, the Agent must be restarted to gain visibility to these changes.
For additional information, please refer to the
[System Deployment: Agent Startup][6] documentation section.
[1]: <https://github.com/daos-stack/daos/blob/master/src/cart#readme> (Collective and RPC Transport)
[1]: <https://github.com/daos-stack/daos/blob/release/2.4/src/cart#readme> (Collective and RPC Transport)
[2]: <installation.md#distribution-packages> (DAOS distribution packages)
[3]: <installation.md#building-daos--dependencies> (DAOS build documentation)
[4]: <deployment.md#server-startup> (DAOS server startup documentation)
Expand Down
8 changes: 4 additions & 4 deletions docs/admin/predeployment_check.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ sudo reboot

!!! note
To force SPDK to use UIO rather than VFIO at daos_server runtime, set
'disable_vfio' in the [server config file](https://github.com/daos-stack/daos/blob/master/utils/config/daos_server.yml#L109),
'disable_vfio' in the [server config file](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/daos_server.yml#L109),
but note that this will require running daos_server as root.

!!! warning
Expand Down Expand Up @@ -153,7 +153,7 @@ All those parameters can be made persistent in /etc/sysctl.conf by adding a new
sysctl file under /etc/sysctl.d (e.g. /etc/sysctl.d/95-daos-net.conf)
with all the relevant settings.

For more information, please refer to the [librdmacm documentation](https://github.com/linux-rdma/rdma-core/blob/master/Documentation/librdmacm.md)
For more information, please refer to the [librdmacm documentation](https://github.com/linux-rdma/rdma-core/blob/release/2.4/Documentation/librdmacm.md)

### Firewall

Expand Down Expand Up @@ -305,9 +305,9 @@ failures.

For RPM installations, the `daos_server` and `daos_agent` services will typically be
launched by `systemd` and its `LimitMEMLOCK` limit is set to `infinity` in the
[`daos_server.service`](https://github.com/daos-stack/daos/blob/master/utils/systemd/daos_server.service)
[`daos_server.service`](https://github.com/daos-stack/daos/blob/release/2.4/utils/systemd/daos_server.service)
and
[`daos_agent.service`](https://github.com/daos-stack/daos/blob/master/utils/systemd/daos_agent.service)
[`daos_agent.service`](https://github.com/daos-stack/daos/blob/release/2.4/utils/systemd/daos_agent.service)
unit files.
(Note that values set in `/etc/security/limits.conf` are ignored by services
launched through `systemd`.)
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/tiering_uns.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ serialization and deserialization tools is available in DAOS v2.0 through
mpiFileUtils, and they will be officially released in DAOS v2.4.

More details and instructions on data mover usage can be found at:
https://github.com/daos-stack/daos/blob/master/docs/user/datamover.md
https://github.com/daos-stack/daos/blob/release/2.4/docs/user/datamover.md
4 changes: 2 additions & 2 deletions docs/admin/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ errors are documented in the table below.

When an operation fails, DAOS returns a negative DER error.
For a full list of errors, please check
<https://github.com/daos-stack/daos/blob/master/src/include/daos_errno.h>
<https://github.com/daos-stack/daos/blob/release/2.4/src/include/daos_errno.h>
(`DER_ERR_GURT_BASE` is equal to 1000, and `DER_ERR_DAOS_BASE` is equal
to 2000).

Expand Down Expand Up @@ -106,7 +106,7 @@ DEBUG-level logging will be sent to the specified file.
## Debugging System

DAOS uses the debug system defined in
[CaRT](https://github.com/daos-stack/daos/tree/master/src/cart),
[CaRT](https://github.com/daos-stack/daos/tree/release/2.4/src/cart),
specifically the GURT library.
Both server and client default log is `stdout`, unless
otherwise set by `D_LOG_FILE` environment variable (client) or
Expand Down
2 changes: 1 addition & 1 deletion docs/admin/ucx.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ After UCX support has been enabled by installing the `mercury-ucx`
package, the network provider must be changed in the DAOS server's
configuration file (`/etc/daos/daos_server.yml`).
A sample YML file is available on
[github](https://github.com/daos-stack/daos/blob/master/utils/config/examples/daos_server_ucx.yml).
[github](https://github.com/daos-stack/daos/blob/release/2.4/utils/config/examples/daos_server_ucx.yml).
The recommended setting for UCX is `provider: ucx+dc_x`.

2 changes: 1 addition & 1 deletion docs/debugging.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DAOS Debugging

DAOS uses the debug system defined in
[CaRT](https://github.com/daos-stack/daos/tree/master/src/cart),
[CaRT](https://github.com/daos-stack/daos/tree/release/2.4/src/cart),
specifically the GURT library.
Both server and client default log is `stdout`,
unless otherwise set by `D_LOG_FILE` environment variable (client) or
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ you may try relocating the repo to `/var/tmp/` in order to build and install fro

- [Protocol Buffers](https://github.com/protocolbuffers/protobuf) v3.11.4. [Installation instructions](https://github.com/protocolbuffers/protobuf/blob/master/src/README.md).
- [Protobuf-C](https://github.com/protobuf-c/protobuf-c) v1.3.3. [Installation instructions](https://github.com/protobuf-c/protobuf-c/blob/master/README.md).
- gRPC plugin: [protoc-gen-go](https://github.com/golang/protobuf) is the version specified in [go.mod](https://github.com/daos-stack/daos/blob/master/src/control/go.mod). This plugin is automatically installed by the Makefile in $DAOSREPO/src/proto.
- gRPC plugin: [protoc-gen-go](https://github.com/golang/protobuf) is the version specified in [go.mod](https://github.com/daos-stack/daos/blob/release/2.4/src/control/go.mod). This plugin is automatically installed by the Makefile in $DAOSREPO/src/proto.

### Compiling Protobuf Files

Expand Down Expand Up @@ -257,7 +257,7 @@ On Mac, please make sure that the Docker settings under
To build the Docker image directly from GitHub, run the following command:

```bash
$ docker build https://github.com/daos-stack/daos.git#master \
$ docker build https://github.com/daos-stack/daos.git#release/2.4 \
-f utils/docker/Dockerfile.el.8 -t daos
```

Expand Down
7 changes: 1 addition & 6 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ 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.3.
The included document versions are associated with DAOS v2.4.
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.3 is the (unstable) master branch for DAOS v2.4 development.
Use at your own risk. Please consider the [latest](../latest/)
stable DAOS release for production deployments.
10 changes: 5 additions & 5 deletions docs/overview/data_integrity.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ the client. The client will verify the keys received.
!!! note Checksums for keys are not stored on the server. A hash of the key is
calculated and used to index the key in the server tree of the keys
(
see [VOS Key Array Stores](https://github.com/daos-stack/daos/blob/master/src/vos/README.md#key-array-stores))
see [VOS Key Array Stores](https://github.com/daos-stack/daos/blob/release/2.4/src/vos/README.md#key-array-stores))
. It is also expected that keys are stored only in Storage Class Memory which
has reliable data integrity protection.

Expand All @@ -53,7 +53,7 @@ received from the client to verify the integrity of the value. If the checksums
don't match, then data corruption has occurred and an error is returned to the
client indicating that the client should try the update again. Whether "server
verify" is enabled or not, the server will store the checksum.
See [VOS](https://github.com/daos-stack/daos/blob/master/src/vos/README.md)
See [VOS](https://github.com/daos-stack/daos/blob/release/2.4/src/vos/README.md)
for more info about checksum management and storage in VOS.

On a fetch, the server will return the stored checksum to the client with the
Expand Down Expand Up @@ -85,7 +85,7 @@ Unlike Single Values, Array Values can be updated and fetched at any part of
an array. In addition, updates to an array are versioned, so a fetch can include
parts from multiple versions of the array. Each of these versioned parts of an
array are called extents. The following diagrams illustrate a couple examples
(also see [VOS Key Array Stores](https://github.com/daos-stack/daos/blob/master/src/vos/README.md#key-array-stores) for
(also see [VOS Key Array Stores](https://github.com/daos-stack/daos/blob/release/2.4/src/vos/README.md#key-array-stores) for
more information):


Expand Down Expand Up @@ -113,7 +113,7 @@ The gray boxes around the extents represent the chunks.
![](../graph/data_integrity/array_with_chunks.png)

(
See [Object Layer](https://github.com/daos-stack/daos/blob/master/src/object/README.md)
See [Object Layer](https://github.com/daos-stack/daos/blob/release/2.4/src/object/README.md)
for more details about the checksum process on object update and fetch)

## Checksum calculations
Expand All @@ -122,7 +122,7 @@ The actual checksum calculations are done by the
and [isa-l_crypto](https://github.com/intel/isa-l_crypto) libraries. However,
these libraries are abstracted away from much of DAOS and a common checksum
library is used with appropriate adapters to the actual isa-l implementations.
[common checksum library](https://github.com/daos-stack/daos/blob/master/src/common/README.md#checksum)
[common checksum library](https://github.com/daos-stack/daos/blob/release/2.4/src/common/README.md#checksum)

## Performance Impact

Expand Down
2 changes: 1 addition & 1 deletion docs/overview/terminology.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@
|[ULT](https://github.com/pmodels/argobots/wiki/User-level-Thread-(ULT))|User Level Thread|
|UPI|Intel Ultra Path Interconnect|
|UUID|Universal Unique Identifier|
|[VOS](https://github.com/daos-stack/daos/blob/master/src/vos/README.md)|Versioning Object Store|
|[VOS](https://github.com/daos-stack/daos/blob/release/2.4/src/vos/README.md)|Versioning Object Store|
6 changes: 3 additions & 3 deletions docs/user/interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ turnaround time on implementing test cases for DAOS.
The Python API is split into several files based on functionality:

* The Python object API:
[daos_api.py](https://github.com/daos-stack/daos/tree/master/src/client/pydaos/raw/daos_api.py).
[daos_api.py](https://github.com/daos-stack/daos/tree/release/2.4/src/client/pydaos/raw/daos_api.py).
* The mapping of C structures to Python classes
[daos_cref.py](https://github.com/daos-stack/daos/tree/master/src/client/pydaos/raw/daos_cref.py)
[daos_cref.py](https://github.com/daos-stack/daos/tree/release/2.4/src/client/pydaos/raw/daos_cref.py)

High-level abstraction classes exist to manipulate DAOS storage:
```python
Expand Down Expand Up @@ -178,6 +178,6 @@ self.d_log.ERROR("Something went very wrong")

API bindings for Go[^2] are also available.

[^1]: https://github.com/daos-stack/daos/blob/master/src/client/pydaos/raw/README.md
[^1]: https://github.com/daos-stack/daos/blob/release/2.4/src/client/pydaos/raw/README.md

[^2]: https://godoc.org/github.com/daos-stack/go-daos/pkg/daos
2 changes: 1 addition & 1 deletion docs/user/python.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PyDAOS

A python module called [PyDAOS](https://github.com/daos-stack/daos/blob/master/src/client/pydaos)
A python module called [PyDAOS](https://github.com/daos-stack/daos/blob/release/2.4/src/client/pydaos)
provides the DAOS API to python users. It aims at providing a pythonic interface
to the DAOS objects by exposing them via native python data structures.
This section focuses on the main PyDAOS interface that comes with its own
Expand Down
Loading

0 comments on commit 7f4ca09

Please sign in to comment.