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

Jump to bottom

Merge upstream/release/2.6 into upstream/google/2.6 #15184

Merged
merged 9 commits into from
Sep 25, 2024
Merged

Merge upstream/release/2.6 into upstream/google/2.6 #15184

merged 9 commits into from
Sep 25, 2024

Conversation

jolivier23
Copy link
Contributor

phender and others added 9 commits September 18, 2024 08:23
@phender
DAOS-16560 test: Improve get_service_file() (#15116) (#15121)
2fe5769 
Handle unexpected output when parsing the systemctl service file.

Signed-off-by: Phil Henderson <phillip.henderson@intel.com>
@gnailzenh
DAOS-16559 container: return EBUSY for container being destroyed (#15154
59cd20a 
) (#15158)

- Don't allow multiple callers to destroy the same container,
  later call should get EBUSY
- Remove the loop in cont_child_destroy_one(), because it will
  wait for refcount dropping to zero, the loop is useless now.

Signed-off-by: Liang Zhen <liang.zhen@intel.com>
@liw
DAOS-16466 misc: Backport fixes (#15045) (#15139)
56845bd 
* DAOS-16251 object: Fix obj_ec_singv_split overflow (#15045)

It has been seen that obj_ec_singv_split may read beyond the end of
sgl->sg_iovs[0].iov_buf:

    iod_size=8569
    c_bytes=4288
    id_shard=0
    tgt_off=1
    iov_len=8569
    iov_buf_len=8569

The memmove read 4288 bytes from offset 4288, whereas the buffer only
had 8569 - 4288 = 4281 bytes from offset 4288. This patch fixes the
problem by adding the min(...) expression.

Signed-off-by: Li Wei <wei.g.li@intel.com>
Required-githooks: true

* DAOS-16251 dtx: Fix dtx_req_send user-after-free (#15035)

In dtx_req_send, since the crt_req_send releases the req reference, din
may have been freed when dereferenced for the DL_CDEBUG call.

Signed-off-by: Li Wei <wei.g.li@intel.com>
Required-githooks: true

* DAOS-16251 mgmt: Fix use-after-free in pool_list (#15014)

In dc_mgmt_pool_list, calling wipe_cred_iov on in->pli_cred after
calling crt_req_decref on rpc is a use-after-free.

Signed-off-by: Li Wei <wei.g.li@intel.com>
Required-githooks: true

* DAOS-16251 tests: Fix various buffer overflows (#15003)

 - vos: Fix vtx_pm buffer overflow
 - vos: Fix evt_ctl stack buffer overflow
 - object: Fix srv_checksum_tests buffer overflow
 - utils: Fix ddb_vos_tests buffer overflow etc

Signed-off-by: Li Wei <wei.g.li@intel.com>
Required-githooks: true

* DAOS-16251 engine: Misc fixes and cleanups (#14983)

- ivc_on_get stores random entry_priv_val into priv_entry for many
    ivc_ent_get implementations. Although not used, this should be
    avoided.

  - ds_iv_done stores pointer to stack variable rc in cb_info->future,
    which outlives the stack frame of ds_iv_done. Although not used,
    this pointer is confusing.

  - ds_pool_iv_map_update associates the input map buffer with the map
    version from ds_pool, rather than the input map version. Although
    this may be fine, we should really not ask for unnecessary
    trouble/concern.

Signed-off-by: Li Wei <wei.g.li@intel.com>
Required-githooks: true

---------

Signed-off-by: Li Wei <wei.g.li@intel.com>
@phender
DAOS-16495 test: Use the test env control config file w/ dmg (#15094) (…
c2eec1b 
…#15149)

Use the TestEnvironment.conftrol.config file by default with the
DmgCommand object when a config file is not specified.

Signed-off-by: Phil Henderson <phillip.henderson@intel.com>
@phender
DAOS-16169 test: Skip recovery tests requiring fault injection (#15159)…
18bae1d 
… (#15169)

When running the recovery/cat_recov_core.py in release builds the tests
should be skipped as they require fault injection.

Signed-off-by: Phil Henderson <phillip.henderson@intel.com>
@kjacque @dependabot
DAOS-16611 java: Bump com.google.protobuf:protobuf-java (#15160) (#15168
fd22261 
)

Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.16.3 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](protocolbuffers/protobuf@v3.16.3...v3.25.5)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@kjacque
DAOS-16607 control: Update vendored version of grpc-go (#15161) (#15167)
10b08c9 
This update addresses CVE-2023-44487.

Signed-off-by: Kris Jacque <kris.jacque@intel.com>
@phender
DAOS-16614 build: Tag 2.6.1 rc2 (#15170)
752837a 
Tag second release candidate for 2.6.1.

Signed-off-by: Phil Henderson <phillip.henderson@intel.com>
@jolivier23
Merge remote-tracking branch 'comm/release/2.6' into jeffolivier/goog…
0d39afc 
…le/2.6

Change-Id: I3b3957e147cbf0e8d725f8c36c0ec4f1c7de35fc
@github-actions GitHub Actions
Copy link

Errors are component not formatted correctly,Ticket number prefix incorrect,PR title is malformatted. See https://daosio.atlassian.net/wiki/spaces/DC/pages/11133911069/Commit+Comments,Unable to load ticket data
https://daosio.atlassian.net/browse/Merge

@jolivier23 jolivier23 merged commit 1448570 into google/2.6 Sep 25, 2024
44 of 47 checks passed
@jolivier23 jolivier23 deleted the jeffolivier/google/2.6 branch September 25, 2024 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjmac mjmac Awaiting requested review from mjmac

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jolivier23 @mjmac @phender @gnailzenh @liw @kjacque