Merge branch 'master' into liw/fix-obj-tests

Required-githooks: true

Jenkinsfile

@@ -309,6 +309,9 @@ pipeline {
  string(name: 'FUNCTIONAL_HARDWARE_MEDIUM_VERBS_PROVIDER_LABEL',
  defaultValue: 'ci_nvme5',
  description: 'Label to use for 5 node Functional Hardware Medium Verbs Provider (MD on SSD) stages')
+ string(name: 'FUNCTIONAL_HARDWARE_MEDIUM_VMD_LABEL',
+ defaultValue: 'ci_vmd5',
+ description: 'Label to use for the Functional Hardware Medium VMD stage')
  string(name: 'FUNCTIONAL_HARDWARE_MEDIUM_UCX_PROVIDER_LABEL',
  defaultValue: 'ci_ofed5',
  description: 'Label to use for 5 node Functional Hardware Medium UCX Provider stage')
@@ -1182,6 +1185,19 @@ pipeline {
  run_if_landing: false,
  job_status: job_status_internal
  ),
+ 'Functional Hardware Medium VMD': getFunctionalTestStage(
+ name: 'Functional Hardware Medium VMD',
+ pragma_suffix: '-hw-medium-vmd',
+ label: params.FUNCTIONAL_HARDWARE_MEDIUM_VMD_LABEL,
+ next_version: next_version,
+ stage_tags: 'hw_vmd,medium',
+ /* groovylint-disable-next-line UnnecessaryGetter */
+ default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
+ nvme: 'auto',
+ run_if_pr: false,
+ run_if_landing: false,
+ job_status: job_status_internal
+ ),
  'Functional Hardware Medium Verbs Provider': getFunctionalTestStage(
  name: 'Functional Hardware Medium Verbs Provider',
  pragma_suffix: '-hw-medium-verbs-provider',

docs/admin/administration.md

@@ -620,21 +620,17 @@ Usage:
 [nvme-faulty command options]
  -u, --uuid= Device UUID to set
  -f, --force Do not require confirmation
+ -l, --host= Single host address <ipv4addr/hostname> to connect to
 ```
 
 To manually evict an NVMe SSD (auto eviction is covered later in this section),
 the device state needs to be set faulty by running the following command:
 ```bash
-$ dmg -l boro-11 storage set nvme-faulty --uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19
+$ dmg storage set nvme-faulty --host=boro-11 --uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19
 NOTICE: This command will permanently mark the device as unusable!
 Are you sure you want to continue? (yes/no)
 yes
--------
-boro-11
--------
- Devices
- UUID:5bd91603-d3c7-4fb7-9a71-76bc25690c19 [TrAddr:]
- Targets:[] Rank:0 State:EVICTED LED:ON
+set-faulty operation performed successfully on the following host: wolf-310:10001
 ```
 The device state will transition from "NORMAL" to "EVICTED" (shown above), during which time the
 faulty device reaction will have been triggered (all targets on the SSD will be rebuilt).
@@ -693,19 +689,14 @@ Usage:
 [nvme command options]
  --old-uuid= Device UUID of hot-removed SSD
  --new-uuid= Device UUID of new device
- --no-reint Bypass reintegration of device and just bring back online.
+ -l, --host= Single host address <ipv4addr/hostname> to connect to
 ```
 
 To replace an NVMe SSD with an evicted device and reintegrate it into use with
 DAOS, run the following command:
 ```bash
-$ dmg -l boro-11 storage replace nvme --old-uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19 --new-uuid=80c9f1be-84b9-4318-a1be-c416c96ca48b
--------
-boro-11
--------
- Devices
- UUID:80c9f1be-84b9-4318-a1be-c416c96ca48b [TrAddr:]
- Targets:[] Rank:1 State:NORMAL LED:OFF
+$ dmg storage replace nvme --host=boro-11 --old-uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19 --new-uuid=80c9f1be-84b9-4318-a1be-c416c96ca48b
+dev-replace operation performed successfully on the following host: boro-11:10001
 ```
 The old, now replaced device will remain in an "EVICTED" state until it is unplugged.
 The new device will transition from a "NEW" state to a "NORMAL" state (shown above).
@@ -716,14 +707,9 @@ In order to reuse a device that was previously set as FAULTY and evicted from th
 system, an admin can run the following command (setting the old device UUID to be the
 new device UUID):
 ```bash
-$ dmg -l boro-11 storage replace nvme --old-uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19 --new-uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19
+$ dmg storage replace nvme --host=boro-11 ---old-uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19 --new-uuid=5bd91603-d3c7-4fb7-9a71-76bc25690c19
 NOTICE: Attempting to reuse a previously set FAULTY device!
--------
-boro-11
--------
- Devices
- UUID:5bd91603-d3c7-4fb7-9a71-76bc25690c19 [TrAddr:]
- Targets:[] Rank:1 State:NORMAL LED:OFF
+dev-replace operation performed successfully on the following host: boro-11:10001
 ```
 The FAULTY device will transition from an "EVICTED" state back to a "NORMAL" state,
 and will again be available for use with DAOS. The use case of this command will mainly

src/bio/README.md

@@ -209,7 +209,7 @@ Devices:
 <a id="82"></a>
 - Manually Set Device State to FAULTY: **$dmg storage set nvme-faulty**
 ```
-$ dmg storage set nvme-faulty --uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0
+$ dmg storage set nvme-faulty --host=localhost --uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0
 Devices
  UUID:9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0 [TrAddr:0000:8d:00.0]
  Targets:[0] Rank:0 State:EVICTED
@@ -219,7 +219,7 @@ Devices
 <a id="83"></a>
 - Replace an evicted device with a new device: **$dmg storage replace nvme**
 ```
-$ dmg storage replace nvme --old-uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0 --new-uuid=8131fc39-4b1c-4662-bea1-734e728c434e
+$ dmg storage replace nvme --host=localhost --old-uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0 --new-uuid=8131fc39-4b1c-4662-bea1-734e728c434e
 Devices
  UUID:8131fc39-4b1c-4662-bea1-734e728c434e [TrAddr:0000:8d:00.0]
  Targets:[0] Rank:0 State:NORMAL
@@ -229,7 +229,7 @@ Devices
 <a id="84"></a>
 - Reuse a previously evicted device: **$dmg storage replace nvme**
 ```
-$ dmg storage replace nvme --old-uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0 --new-uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0
+$ dmg storage replace nvme --host=localhost --old-uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0 --new-uuid=9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0
 Devices
  UUID:9fb3ce57-1841-43e6-8b70-2a5e7fb2a1d0 [TrAddr:0000:8a:00.0]
  Targets:[0] Rank:0 State:NORMAL

src/bio/smd.pb-c.c

@@ -2208,69 +2208,39 @@ const ProtobufCMessageDescriptor ctl__led_manage_req__descriptor =
  (ProtobufCMessageInit) ctl__led_manage_req__init,
  NULL,NULL,NULL /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor ctl__dev_replace_req__field_descriptors[3] =
-{
- {
- "old_dev_uuid",
- 1,
- PROTOBUF_C_LABEL_NONE,
- PROTOBUF_C_TYPE_STRING,
- 0, /* quantifier_offset */
- offsetof(Ctl__DevReplaceReq, old_dev_uuid),
- NULL,
- &protobuf_c_empty_string,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "new_dev_uuid",
- 2,
- PROTOBUF_C_LABEL_NONE,
- PROTOBUF_C_TYPE_STRING,
- 0, /* quantifier_offset */
- offsetof(Ctl__DevReplaceReq, new_dev_uuid),
- NULL,
- &protobuf_c_empty_string,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "no_reint",
- 3,
- PROTOBUF_C_LABEL_NONE,
- PROTOBUF_C_TYPE_BOOL,
- 0, /* quantifier_offset */
- offsetof(Ctl__DevReplaceReq, no_reint),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
+static const ProtobufCFieldDescriptor ctl__dev_replace_req__field_descriptors[2] = {
+ {
+ "old_dev_uuid", 1, PROTOBUF_C_LABEL_NONE, PROTOBUF_C_TYPE_STRING, 0, /* quantifier_offset */
+ offsetof(Ctl__DevReplaceReq, old_dev_uuid), NULL, &protobuf_c_empty_string, 0, /* flags */
+ 0, NULL, NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "new_dev_uuid", 2, PROTOBUF_C_LABEL_NONE, PROTOBUF_C_TYPE_STRING, 0, /* quantifier_offset */
+ offsetof(Ctl__DevReplaceReq, new_dev_uuid), NULL, &protobuf_c_empty_string, 0, /* flags */
+ 0, NULL, NULL /* reserved1,reserved2, etc */
+ },
 };
 static const unsigned ctl__dev_replace_req__field_indices_by_name[] = {
- 1, /* field[1] = new_dev_uuid */
- 2, /* field[2] = no_reint */
- 0, /* field[0] = old_dev_uuid */
-};
-static const ProtobufCIntRange ctl__dev_replace_req__number_ranges[1 + 1] =
-{
- { 1, 0 },
- { 0, 3 }
+ 1, /* field[1] = new_dev_uuid */
+ 0, /* field[0] = old_dev_uuid */
 };
-const ProtobufCMessageDescriptor ctl__dev_replace_req__descriptor =
-{
- PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
- "ctl.DevReplaceReq",
- "DevReplaceReq",
- "Ctl__DevReplaceReq",
- "ctl",
- sizeof(Ctl__DevReplaceReq),
- 3,
- ctl__dev_replace_req__field_descriptors,
- ctl__dev_replace_req__field_indices_by_name,
- 1, ctl__dev_replace_req__number_ranges,
- (ProtobufCMessageInit) ctl__dev_replace_req__init,
- NULL,NULL,NULL /* reserved[123] */
+static const ProtobufCIntRange ctl__dev_replace_req__number_ranges[1 + 1] = {{1, 0}, {0, 2}};
+const ProtobufCMessageDescriptor ctl__dev_replace_req__descriptor = {
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+ "ctl.DevReplaceReq",
+ "DevReplaceReq",
+ "Ctl__DevReplaceReq",
+ "ctl",
+ sizeof(Ctl__DevReplaceReq),
+ 2,
+ ctl__dev_replace_req__field_descriptors,
+ ctl__dev_replace_req__field_indices_by_name,
+ 1,
+ ctl__dev_replace_req__number_ranges,
+ (ProtobufCMessageInit)ctl__dev_replace_req__init,
+ NULL,
+ NULL,
+ NULL /* reserved[123] */
 };
 static const ProtobufCFieldDescriptor ctl__set_faulty_req__field_descriptors[1] =
 {

src/client/java/daos-java/pom.xml

@@ -36,7 +36,7 @@
  <dependency>
  <groupId>com.google.protobuf</groupId>
  <artifactId>protobuf-java</artifactId>
- <version>3.16.3</version>
+ <version>3.25.5</version>
  </dependency>
  <dependency>
  <groupId>io.netty</groupId>

src/common/tests_dmg_helpers.c

@@ -1393,7 +1393,7 @@ dmg_storage_set_nvme_fault(const char *dmg_config_file,
  D_GOTO(out, rc = -DER_NOMEM);
  }
 
- args = cmd_push_arg(args, &argcount, " --host-list=%s ", host);
+ args = cmd_push_arg(args, &argcount, " --host=%s ", host);
  if (args == NULL)
  D_GOTO(out, rc = -DER_NOMEM);