Skip to content

Commit e1c08ea

Browse files
committed
DAOS-18368 rebuild: a few log change
Signed-off-by: Xuezhao Liu <[email protected]>
1 parent 66f44a9 commit e1c08ea

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

src/object/obj_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* (C) Copyright 2016-2024 Intel Corporation.
3-
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
3+
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
44
*
55
* SPDX-License-Identifier: BSD-2-Clause-Patent
66
*/

src/object/obj_layout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* (C) Copyright 2016-2023 Intel Corporation.
3-
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
3+
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
44
*
55
* SPDX-License-Identifier: BSD-2-Clause-Patent
66
*/

src/object/srv_obj.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* (C) Copyright 2016-2024 Intel Corporation.
33
* (C) Copyright 2025 Google LLC
4-
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
4+
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
55
*
66
* SPDX-License-Identifier: BSD-2-Clause-Patent
77
*/
@@ -702,17 +702,19 @@ obj_set_reply_sizes(crt_rpc_t *rpc, daos_iod_t *iods, int iod_nr, uint8_t *skips
702702
D_DEBUG(DB_IO, DF_UOID" %d:"DF_U64"\n", DP_UOID(orw->orw_oid),
703703
i, iods[idx].iod_size);
704704
if ((orw->orw_flags & ORF_FOR_MIGRATION) && sizes[i] == 0) {
705-
D_INFO(DF_CONT " obj " DF_UOID "rebuild fetch zero iod_size, i:%d/idx:%d, "
706-
"iod_nr %d, orw_epoch " DF_X64 ", orw_epoch_first " DF_X64
707-
" may cause DER_DATA_LOSS",
708-
DP_CONT(orw->orw_pool_uuid, orw->orw_co_uuid), DP_UOID(orw->orw_oid),
709-
i, idx, iods[idx].iod_nr, orw->orw_epoch, orw->orw_epoch_first);
705+
D_DEBUG(DB_REBUILD,
706+
DF_CONT " obj " DF_UOID "rebuild fetch zero iod_size, "
707+
"i:%d/idx:%d, iod_nr %d, orw_epoch " DF_X64
708+
", orw_epoch_first " DF_X64 " may cause DER_DATA_LOSS",
709+
DP_CONT(orw->orw_pool_uuid, orw->orw_co_uuid),
710+
DP_UOID(orw->orw_oid), i, idx, iods[idx].iod_nr, orw->orw_epoch,
711+
orw->orw_epoch_first);
710712
if (iods[idx].iod_type == DAOS_IOD_ARRAY) {
711713
int j;
712714

713715
for (j = 0; j < min(8, iods[idx].iod_nr); j++)
714-
D_INFO("recx[%d] - " DF_RECX, j,
715-
DP_RECX(iods[idx].iod_recxs[j]));
716+
D_DEBUG(DB_REBUILD, "recx[%d] - " DF_RECX, j,
717+
DP_RECX(iods[idx].iod_recxs[j]));
716718
}
717719
}
718720
idx++;

src/object/srv_obj_migrate.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ migrate_fetch_update_inline(struct migrate_one *mrone, daos_handle_t oh,
790790
struct dcs_iod_csums *iod_csums = NULL;
791791
int iod_cnt = 0;
792792
int start;
793-
char iov_buf[OBJ_ENUM_UNPACK_MAX_IODS][MAX_BUF_SIZE];
793+
char iov_buf[OBJ_ENUM_UNPACK_MAX_IODS][MAX_BUF_SIZE];
794794
bool fetch = false;
795795
int i;
796796
int rc = 0;
@@ -1259,13 +1259,13 @@ migrate_fetch_update_single(struct migrate_one *mrone, daos_handle_t oh,
12591259
* the rebuild and retry.
12601260
*/
12611261
rc = -DER_DATA_LOSS;
1262-
D_DEBUG(DB_REBUILD,
1262+
DL_INFO(rc,
12631263
DF_RB ": cont " DF_UUID " obj " DF_UOID " dkey " DF_KEY " " DF_KEY
1264-
" nr %d/%d eph " DF_X64 " " DF_RC "\n",
1264+
" nr %d/%d eph " DF_X64,
12651265
DP_RB_MRO(mrone), DP_UUID(mrone->mo_cont_uuid),
12661266
DP_UOID(mrone->mo_oid), DP_KEY(&mrone->mo_dkey),
12671267
DP_KEY(&mrone->mo_iods[i].iod_name), mrone->mo_iod_num, i,
1268-
mrone->mo_epoch, DP_RC(rc));
1268+
mrone->mo_epoch);
12691269
if (log_nr <= 128) {
12701270
mrone_dump_info(mrone, oh, &mrone->mo_iods[i]);
12711271
log_nr++;

src/rebuild/scan.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* (C) Copyright 2017-2024 Intel Corporation.
3-
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
3+
* (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
44
*
55
* SPDX-License-Identifier: BSD-2-Clause-Patent
66
*/
@@ -68,9 +68,9 @@ rebuild_obj_fill_buf(daos_handle_t ih, d_iov_t *key_iov,
6868
shards[count] = obj_val->shard;
6969
arg->count++;
7070

71-
D_DEBUG(DB_REBUILD, "send oid/con "DF_UOID"/"DF_UUID" ephs "DF_U64
72-
"shard %d cnt %d tgt_id %d\n", DP_UOID(oids[count]),
73-
DP_UUID(arg->cont_uuid), obj_val->eph, shards[count],
71+
D_DEBUG(DB_REBUILD,
72+
"send oid/con " DF_UOID "/" DF_UUID " ephs " DF_X64 " shard %d cnt %d tgt_id %d\n",
73+
DP_UOID(oids[count]), DP_UUID(arg->cont_uuid), obj_val->eph, shards[count],
7474
arg->count, arg->tgt_id);
7575

7676
rc = dbtree_iter_delete(ih, NULL);

0 commit comments

Comments
 (0)