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 #14916

Merged
merged 11 commits into from
Aug 13, 2024
Merged

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

merged 11 commits into from
Aug 13, 2024

Conversation

cdavis28
Copy link
Contributor

Michael-Hennecke and others added 10 commits August 7, 2024 13:53
@Michael-Hennecke
DAOS-16162 doc: DAOS 2.6 support matrix (#14877)
a916a3b 
DAOS 2.6 support_matrix.md

Signed-off-by: Michael Hennecke <[email protected]>
@soumagne
DAOS-15997 build: bump mercury version to 2.4.0rc4 (#14873) (#14883)
3f0d0d1 
Signed-off-by: Jerome Soumagne <[email protected]>
@frostedcmos
DAOS-15961 cart: Reorganize how envs are handled (#14504) (#14887)
9bbab7f 
Change to how cart deals with envariables:
- env list is now controlled by CRT_ENV_LIST macro in crt_types_internal.h
- all envs stored in structure generated from CRT_ENV_LST (crrt_genv) now,
  ENV is read out at crt_env_init() time and env strings deallocated at crt_env_fini().
- accsor functions/macros crt_env_init/fini/get/dump are provided.
- string-type envs no longer need to be freed after retrieval.
- Change cart utility function to populate crt_init_options_t instead of setting and querying env.

With this change, any env to be used will need to appear on the list first, ensuring it gets
dumped as well as ensuring proper name usage later. Env name typos when using crt_env_get()
will now result in compile time errors

Signed-off-by: Alexander A Oganezov <[email protected]>
@mjmac
DAOS-16127 tools: Add daos health check command (#14730) (#14885)
79fb9df 
Perform basic system health checks from the client
perspective. Checks the following:

  * Client/Server versions
  * Key library versions and paths
  * Connected sytem information
  * Pool status for all pools to which the user
    has access
  * Container status for all containers in the
    checked pools

Change-Id: I9154ee7f3632996e0e67ad6f320874e1df2e0d23
Signed-off-by: Michael MacDonald <[email protected]>
@frostedcmos
DAOS-16288 cart: coverity fixes for 16287,16288,16289 (#14843) (#14897)
23daf02 
Coverity fixes for DAOS-16287,16288,16289.

Signed-off-by: Alexander A Oganezov <[email protected]>
@liuxuezhao
DAOS-16035 rebuild: create VOS cont when no record need to be rebuilt… (
19e880c 
#14841)

For EC object rebuild, some ext not exist on some shards, for this case
create VOS container when no record need to be rebuilt. To avoid
following IO cannot find container and fail at obj_ioc_init() ->
cont_child_lookup().
Another case is in cont_snap_update_one() create the vos cont if
non-exist.

Possibly yield in vos_cont_create() -> bio_wal_commit() -> wait_tx_committed(),
so tasklet cannot work.

Signed-off-by: Xuezhao Liu <[email protected]>
@jolivier23
DAOS-16305 build: Simplify hermetic builds (#14874) (#14899)
df4bf06 
Move URLs for repos to the config file allowing
one to replace the config file.

Signed-off-by: Jeff Olivier <[email protected]>
@Nasf-Fan
DAOS-16005 object: check resent coll_punch on leader and relay engine (…
9325b67 
…#14659) (#14826)

For collective punch RPC handler on leader or relay engine, if related
DTX has already been prepared when handling resent RPC, then we should
avoid re-executing the punch locally. Otherwise, it may cleanup former
prepared DTX entry by wrong.

Signed-off-by: Fan Yong <[email protected]>
@daltonbohning @phender
DAOS-16217 test: Update run_local(). (#14748) (#14866)
f390961 
Update the current run_local() command to return an object similar to
run_remote() to allow them to be used interchangeably.

increase verify_perms.py timeout.

Also include #14882
Use subprocess.run() for run_local()

Signed-off-by: Dalton Bohning <[email protected]>
Co-authored-by: Phil Henderson <[email protected]>
@saurabhtandan
DAOS-15960 tests: Improvements for io_sys_admin test (#14503) (#14903)
2cd3dc3 
Use different set of oclasses for ior and mdtest.
Add intercept option in mdtest_test_base.
Use interception for POSIX runs in the test.

Signed-off-by: Saurabh Tandan <[email protected]>
@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

@cdavis28
Copy link
Contributor Author

@jolivier23 what do we do with the clang-format failure? edit that commit?

@cdavis28 cdavis28 force-pushed the chrd/google/2.6 branch 2 times, most recently from 8d5b4a6 to 817028c Compare August 13, 2024 16:37
@cdavis28 cdavis28 merged commit 3a6bb5a into google/2.6 Aug 13, 2024
49 of 50 checks passed
@cdavis28 cdavis28 deleted the chrd/google/2.6 branch August 13, 2024 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jolivier23 jolivier23 jolivier23 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@cdavis28 @jolivier23 @Michael-Hennecke @soumagne @frostedcmos @mjmac @liuxuezhao @Nasf-Fan @daltonbohning @saurabhtandan