Merge branch 'jvolivie/backport_io_forward' into jvolivie/add_mode

Change-Id: Ieb288bb97108c23f9d91ea150cf6d40b82757d6c
daos-stack · Apr 17, 2024 · b62b96f · b62b96f
2 parents a97f90a + 974f213
commit b62b96f
Show file tree

Hide file tree

Showing 37 changed files with 149 additions and 107 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,58 +2,58 @@
 # a component sha1 to ensure that corresponding package build is done
 #utils/build.config @daos-stack/release-engineering
 # or updates packaging in any way
-utils/rpms @daos-stack/build-and-release-watchers
+#utils/rpms @daos-stack/build-and-release-watchers
 
-src/gurt @daos-stack/common-watchers
-src/common @daos-stack/common-watchers
+#src/gurt @daos-stack/common-watchers
+#src/common @daos-stack/common-watchers
 
 # any PR that touches Go files should get a review from go-owners
-*.go @daos-stack/go-owners @daos-stack/go-watchers
+#*.go @daos-stack/go-owners @daos-stack/go-watchers
 
 # Notify vos-watcher of files touched affecting VOS
-src/vos/ @daos-stack/vos-owners @daos-stack/vos-watchers
-src/common/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers
-src/include/daos/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers
-src/include/daos_srv/vos*.* @daos-stack/vos-owners @daos-stack/vos-watchers
-src/include/daos_srv/evtree.h @daos-stack/vos-owners @daos-stack/vos-watchers
+#src/vos/ @daos-stack/vos-owners @daos-stack/vos-watchers
+#src/common/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers
+#src/include/daos/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers
+#src/include/daos_srv/vos*.* @daos-stack/vos-owners @daos-stack/vos-watchers
+#src/include/daos_srv/evtree.h @daos-stack/vos-owners @daos-stack/vos-watchers
 
 # Jenkinsfile changes should be reviewed by Release Engineering
-Jenkinsfile @daos-stack/build-and-release-watchers
+#Jenkinsfile @daos-stack/build-and-release-watchers
 
 # any PR that touches client API or high level client code
-src/client @daos-stack/client-api-owners @daos-stack/client-api-watchers
-src/include/daos_*.* @daos-stack/client-api-owners @daos-stack/client-api-watchers
+#src/client @daos-stack/client-api-owners @daos-stack/client-api-watchers
+#src/include/daos_*.* @daos-stack/client-api-owners @daos-stack/client-api-watchers
 
 # doc-watchers: files affecting documentation (docs, doxygen, etc.)
-mkdocs.yml @daos-stack/doc-watchers
-Doxyfile @daos-stack/doc-watchers
-docs/ @daos-stack/doc-watchers
+#mkdocs.yml @daos-stack/doc-watchers
+#Doxyfile @daos-stack/doc-watchers
+#docs/ @daos-stack/doc-watchers
 #src/include/*.h @daos-stack/doc-watchers
-*.md @daos-stack/doc-watchers
+#*.md @daos-stack/doc-watchers
 
 # dev-build-watchers: Files affecting local builds (e.g. SCons)
-SConstruct @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
-SConscript @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
-site_scons/ @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
-utils/sl @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
+#SConstruct @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
+#SConscript @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
+#site_scons/ @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
+#utils/sl @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
 
 # ftest-watchers: files affecting functional tests
-src/tests/ftest @daos-stack/ftest-owners @daos-stack/ftest-watchers
+#src/tests/ftest @daos-stack/ftest-owners @daos-stack/ftest-watchers
 
 # telem-watchers: Changes related to the telemetry library
-src/utils/daos_metrics @daos-stack/telem-watchers
-src/gurt/telemetry.c @daos-stack/telem-watchers
+#src/utils/daos_metrics @daos-stack/telem-watchers
+#src/gurt/telemetry.c @daos-stack/telem-watchers
 
 # PRs that touch the object layer
-src/object/ @daos-stack/object-owners @daos-stack/object-watchers
-src/rebuild/ @daos-stack/object-owners @daos-stack/object-watchers
-src/dtx/ @daos-stack/object-owners @daos-stack/object-watchers
+#src/object/ @daos-stack/object-owners @daos-stack/object-watchers
+#src/rebuild/ @daos-stack/object-owners @daos-stack/object-watchers
+#src/dtx/ @daos-stack/object-owners @daos-stack/object-watchers
 
 # PRs that touch the CaRT layer
-src/cart/ @daos-stack/cart-owners @daos-stack/cart-watchers
+#src/cart/ @daos-stack/cart-owners @daos-stack/cart-watchers
 
 # PRs that touch the metadata
-src/pool/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
-src/container/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
-src/rdb/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
-src/rsvc/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
+#src/pool/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
+#src/container/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
+#src/rdb/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
+#src/rsvc/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -289,16 +289,16 @@ pipeline {
  description: 'Run the Functional on Ubuntu 20.04 test stage' +
  ' Requires CI_MORE_FUNCTIONAL_PR_TESTS')
  booleanParam(name: 'CI_medium_TEST',
- defaultValue: true,
+ defaultValue: false,
  description: 'Run the Functional Hardware Medium test stage')
  booleanParam(name: 'CI_medium-verbs-provider_TEST',
- defaultValue: true,
+ defaultValue: false,
  description: 'Run the Functional Hardware Medium Verbs Provider test stage')
  booleanParam(name: 'CI_medium-ucx-provider_TEST',
- defaultValue: true,
+ defaultValue: false,
  description: 'Run the Functional Hardware Medium UCX Provider test stage')
  booleanParam(name: 'CI_large_TEST',
- defaultValue: true,
+ defaultValue: false,
  description: 'Run the Functional Hardware Large test stage')
  string(name: 'CI_UNIT_VM1_LABEL',
  defaultValue: 'ci_vm1',

diff --git a/debian/rules b/debian/rules
@@ -18,7 +18,7 @@ endif
 SCONS = scons -j $(NUMJOBS)
 DEB_SCONS_OPTIONS := --config=force --no-rpath USE_INSTALLED=all \
  CONF_DIR=$(sysconfdir)/daos PREFIX=$(prefix) \
- $(SCONS_ARGS)
+ $(SCONS_ARGS) STATIC_FUSE=0
 
 export GOCACHE := $(CURDIR)/.gocache
 
@@ -34,7 +34,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
  echo $(DEB_BUILD_OPTIONS)
- $(SCONS) --clean
+ $(SCONS) --clean STATIC_FUSE=0
  rm -rf build install
  find . -name '*.pyc' -delete
  rm -rf _build.external-Linux

diff --git a/site_scons/prereq_tools/base.py b/site_scons/prereq_tools/base.py
@@ -520,7 +520,7 @@ def run_build(self, opts):
  # argobots is not really needed by client but it's difficult to separate
  common_reqs = ['argobots', 'ucx', 'ofi', 'hwloc', 'mercury', 'boost', 'uuid',
  'crypto', 'protobufc', 'lz4', 'isal', 'isal_crypto']
- client_reqs = ['fuse', 'json-c', 'capstone', 'archive']
+ client_reqs = ['fuse', 'json-c', 'capstone']
  server_reqs = ['pmdk', 'spdk', 'ipmctl']
  test_reqs = ['cmocka']
 

diff --git a/src/cart/utils/memcheck-cart.supp b/src/cart/utils/memcheck-cart.supp
@@ -444,6 +444,24 @@
  ...
  fun:indexbytebody
 }
+{
+ go-cond-racecall
+ Memcheck:Cond
+ ...
+ fun:racecall
+}
+{
+ go-value8-write_racecall
+ Memcheck:Value8
+ fun:__tsan_write
+ fun:racecall
+}
+{
+ go-value8-racecall
+ Memcheck:Value8
+ fun:_ZN6__tsan9ShadowSetEPNS_9RawShadowES1_S0_
+ fun:racecall
+}
 {
  FI leak 8
  Memcheck:Leak
@@ -483,9 +501,12 @@
  Memcheck:Param
  sendmsg(msg.msg_iov[1])
  ...
+ fun:sendmsg
+ fun:ofi_sockapi_sendv_socket
  fun:ofi_bsock_sendv
  ...
  fun:fi_senddata
+ ...
 }
 {
  Tcp provider with ofi rxm
@@ -495,6 +516,7 @@
  fun:ofi_bsock_sendv
  ...
  fun:fi_tsend
+ ...
 }
 {
  Tcp provider with ofi rxm 2
@@ -539,3 +561,14 @@
  Memcheck:Value8
  fun:aeshashbody
 }
+{
+ DAOS-15159
+ Memcheck:Param
+ write(buf)
+ fun:runtime/internal/syscall.Syscall6
+}
+{
+ DAOS-15548
+ Memcheck:Addr1
+ fun:racecallatomic
+}
diff --git a/src/control/lib/control/rpc_test.go b/src/control/lib/control/rpc_test.go
@@ -99,8 +99,11 @@ func TestControl_InvokeUnaryRPCAsync(t *testing.T) {
  "request timeout": {
  timeout: 1 * time.Nanosecond,
  req: &testRequest{
- rpcFn: func(_ context.Context, _ *grpc.ClientConn) (proto.Message, error) {
+ rpcFn: func(ctx context.Context, _ *grpc.ClientConn) (proto.Message, error) {
  time.Sleep(1 * time.Microsecond)
+ if ctx.Err() != nil {
+ return nil, ctx.Err()
+ }
  return defaultMessage, nil
  },
  },
@@ -120,7 +123,10 @@ func TestControl_InvokeUnaryRPCAsync(t *testing.T) {
  }
  }(),
  req: &testRequest{
- rpcFn: func(_ context.Context, _ *grpc.ClientConn) (proto.Message, error) {
+ rpcFn: func(ctx context.Context, _ *grpc.ClientConn) (proto.Message, error) {
+ if ctx.Err() != nil {
+ return nil, ctx.Err()
+ }
  time.Sleep(10 * time.Second) // shouldn't be allowed to run this long
  return defaultMessage, nil
  },

diff --git a/src/control/logging/syslog_test.go b/src/control/logging/syslog_test.go
@@ -32,6 +32,10 @@ func TestSyslogOutput(t *testing.T) {
  t.Log("current user does not have permissions to view system log")
  return
  }
+ if _, err := syslog.New(syslog.LOG_ALERT, "test"); err != nil {
+ t.Logf("unable to connect to syslog: %s -- not running this test", err)
+ return
+ }
 
  rand.Seed(time.Now().UnixNano())
  runes := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")

diff --git a/src/control/provider/system/system_linux_test.go b/src/control/provider/system/system_linux_test.go
@@ -97,7 +97,7 @@ func TestIsMounted(t *testing.T) {
  expErr: errors.New("no such file or directory"),
  },
  "neither dir nor device": {
- target: "/dev/log",
+ target: "/dev/stderr",
  expErr: errors.New("not a valid mount target"),
  },
  } {
@@ -173,7 +173,7 @@ func TestSystemLinux_GetFsType(t *testing.T) {
  expErr: syscall.ENOENT,
  },
  "temp dir": {
- path: "/run",
+ path: "/dev",
  expResult: &FsType{
  Name: "tmpfs",
  NoSUID: true,

diff --git a/src/tests/ftest/cart/corpc/corpc_five_node.yaml b/src/tests/ftest/cart/corpc/corpc_five_node.yaml
@@ -10,7 +10,7 @@ ENV:
  - test_servers_CRT_CTX_NUM: "0"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep

diff --git a/src/tests/ftest/cart/corpc/corpc_two_node.yaml b/src/tests/ftest/cart/corpc/corpc_two_node.yaml
@@ -10,7 +10,7 @@ ENV:
  - test_servers_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep

diff --git a/src/tests/ftest/cart/ctl/ctl_five_node.yaml b/src/tests/ftest/cart/ctl/ctl_five_node.yaml
@@ -11,7 +11,7 @@ ENV:
  - test_clients_CRT_CTX_NUM: "0"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep

diff --git a/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.yaml b/src/tests/ftest/cart/ghost_rank_rpc/ghost_rank_rpc_one_node.yaml
@@ -10,7 +10,7 @@ ENV:
  - test_servers_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep

diff --git a/src/tests/ftest/cart/group_test/group_test.yaml b/src/tests/ftest/cart/group_test/group_test.yaml
@@ -8,7 +8,7 @@ ENV:
  - OFI_INTERFACE: "eth0"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
  hosts_1:
  config: one_node

diff --git a/src/tests/ftest/cart/iv/iv_one_node.yaml b/src/tests/ftest/cart/iv/iv_one_node.yaml
@@ -18,7 +18,7 @@ env_CRT_PHY_ADDR_STR: !mux
  sm:
  CRT_PHY_ADDR_STR: "sm"
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
  hosts_1:
  config: one_node

diff --git a/src/tests/ftest/cart/iv/iv_two_node.yaml b/src/tests/ftest/cart/iv/iv_two_node.yaml
@@ -12,7 +12,7 @@ ENV:
  - CRT_TEST_CONT: "1"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep

diff --git a/src/tests/ftest/cart/no_pmix/multictx_one_node.yaml b/src/tests/ftest/cart/no_pmix/multictx_one_node.yaml
@@ -13,6 +13,8 @@ env_CRT_PHY_ADDR_STR: !mux
  sm:
  CRT_PHY_ADDR_STR: "sm"
  ofi_tcp:
+ CRT_PHY_ADDR_STR: "ofi+tcp"
+ ofi_tcp_rxm:
  CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
 tests: !mux
  no_pmix_multi_ctx:

diff --git a/src/tests/ftest/cart/no_pmix_group_test.c b/src/tests/ftest/cart/no_pmix_group_test.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2018-2022 Intel Corporation.
+ * (C) Copyright 2018-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -686,8 +686,7 @@ int main(int argc, char **argv)
  }
 
  for (i = 0; i < 10; i++) {
- rc = asprintf(&uris[i], "ofi+tcp;ofi_rxm://127.0.0.1:%d",
- 10000 + i);
+ rc = asprintf(&uris[i], "ofi+tcp://127.0.0.1:%d", 10000 + i);
  if (rc == -1) {
  D_ERROR("asprintf() failed\n");
  assert(0);

diff --git a/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.yaml b/src/tests/ftest/cart/nopmix_launcher/launcher_one_node.yaml
@@ -8,7 +8,7 @@ ENV:
  - OFI_INTERFACE: "eth0"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
  hosts_1:
  config: one_node

diff --git a/src/tests/ftest/cart/rpc/multisend_one_node.yaml b/src/tests/ftest/cart/rpc/multisend_one_node.yaml
@@ -17,7 +17,7 @@ env_CRT_CTX_SHARE_ADDR: !mux
  CRT_CTX_SHARE_ADDR: "0"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
  hosts_1:
  config: one_node

diff --git a/src/tests/ftest/cart/rpc/rpc_one_node.yaml b/src/tests/ftest/cart/rpc/rpc_one_node.yaml
@@ -19,7 +19,7 @@ env_CRT_PHY_ADDR_STR: !mux
  sm:
  CRT_PHY_ADDR_STR: "sm"
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 hosts: !mux
  hosts_1:
  config: one_node

diff --git a/src/tests/ftest/cart/rpc/rpc_two_node.yaml b/src/tests/ftest/cart/rpc/rpc_two_node.yaml
@@ -11,7 +11,7 @@ ENV:
  - test_clients_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep

diff --git a/src/tests/ftest/cart/rpc/swim_notification.yaml b/src/tests/ftest/cart/rpc/swim_notification.yaml
@@ -12,7 +12,7 @@ ENV:
  - test_clients_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep

diff --git a/src/tests/ftest/cart/selftest/selftest_three_node.yaml b/src/tests/ftest/cart/selftest/selftest_three_node.yaml
@@ -11,7 +11,7 @@ ENV:
  - test_clients_CRT_CTX_NUM: "16"
 env_CRT_PHY_ADDR_STR: !mux
  ofi_tcp:
- CRT_PHY_ADDR_STR: "ofi+tcp;ofi_rxm"
+ CRT_PHY_ADDR_STR: "ofi+tcp"
 env_CRT_CTX_SHARE_ADDR: !mux
  no_sep:
  env: no_sep