Skip to content

Revert "[meta] do not fail bulk operations if MODE_IGNORE_ERROR (#1613)" #1676

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Revert "[meta] do not fail bulk operations if MODE_IGNORE_ERROR (#1613)" #1676

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c3dc31
Revert "[meta] do not fail bulk operations if MODE_IGNORE_ERROR (#1613)"
Ndancejic Oct 28, 2025
b65debf
Merge branch 'master' into revert
prabhataravind Oct 30, 2025
57d6c0f
Merge branch 'master' into revert
Ndancejic Nov 25, 2025
9663a9f
Merge branch 'master' into revert
Ndancejic Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions meta/Meta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@

#define CHECK_STATUS_SUCCESS(s) { if ((s) != SAI_STATUS_SUCCESS) return (s); }

#define CHECK_STATUS_SUCCESS_MODE(s,m) \
{ \
if ((s) != SAI_STATUS_SUCCESS && m != SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR) return (s); \
} \

#define VALIDATION_LIST(md,vlist) \
{ \
auto _status = meta_genetic_validation_list(md,vlist.count,vlist.list); \
Expand Down Expand Up @@ -628,14 +623,14 @@
for (uint32_t idx = 0; idx < object_count; idx++) \
{ \
sai_status_t status = meta_sai_validate_ ##ot (&ot[idx], true); \
CHECK_STATUS_SUCCESS_MODE(status, mode); \
CHECK_STATUS_SUCCESS(status); \
sai_object_meta_key_t meta_key = { \
.objecttype = (sai_object_type_t)SAI_OBJECT_TYPE_ ## OT, \
.objectkey = { .key = { .ot = ot[idx] } } \
}; \
vmk.push_back(meta_key); \
status = meta_generic_validation_create(meta_key, ot[idx].switch_id, attr_count[idx], attr_list[idx]); \
CHECK_STATUS_SUCCESS_MODE(status, mode); \
CHECK_STATUS_SUCCESS(status); \
} \
auto status = m_implementation->bulkCreate(object_count, ot, attr_count, attr_list, mode, object_statuses); \
for (uint32_t idx = 0; idx < object_count; idx++) \
Expand Down Expand Up @@ -672,14 +667,14 @@
for (uint32_t idx = 0; idx < object_count; idx++) \
{ \
sai_status_t status = meta_sai_validate_ ##ot (&ot[idx], false); \
CHECK_STATUS_SUCCESS_MODE(status, mode); \
CHECK_STATUS_SUCCESS(status); \
sai_object_meta_key_t meta_key = { \
.objecttype = (sai_object_type_t)SAI_OBJECT_TYPE_ ## OT, \
.objectkey = { .key = { .ot = ot[idx] } } \
}; \
vmk.push_back(meta_key); \
status = meta_generic_validation_remove(meta_key); \
CHECK_STATUS_SUCCESS_MODE(status, mode); \
CHECK_STATUS_SUCCESS(status); \
} \
auto status = m_implementation->bulkRemove(object_count, ot, mode, object_statuses); \
for (uint32_t idx = 0; idx < object_count; idx++) \
Expand Down Expand Up @@ -718,14 +713,14 @@
for (uint32_t idx = 0; idx < object_count; idx++) \
{ \
sai_status_t status = meta_sai_validate_ ##ot (&ot[idx], false); \
CHECK_STATUS_SUCCESS_MODE(status, mode); \
CHECK_STATUS_SUCCESS(status); \
sai_object_meta_key_t meta_key = { \
.objecttype = (sai_object_type_t)SAI_OBJECT_TYPE_ ## OT, \
.objectkey = { .key = { .ot = ot[idx] } } \
}; \
vmk.push_back(meta_key); \
status = meta_generic_validation_set(meta_key, &attr_list[idx]); \
CHECK_STATUS_SUCCESS_MODE(status, mode); \
CHECK_STATUS_SUCCESS(status); \
} \
auto status = m_implementation->bulkSet(object_count, ot, attr_list, mode, object_statuses); \
for (uint32_t idx = 0; idx < object_count; idx++) \
Expand Down Expand Up @@ -1211,15 +1206,15 @@
{
sai_status_t status = meta_sai_validate_oid(object_type, &object_id[idx], SAI_NULL_OBJECT_ID, false);

CHECK_STATUS_SUCCESS_MODE(status, mode);
CHECK_STATUS_SUCCESS(status);

sai_object_meta_key_t meta_key = { .objecttype = object_type, .objectkey = { .key = { .object_id = object_id[idx] } } };

vmk.push_back(meta_key);

status = meta_generic_validation_remove(meta_key);

CHECK_STATUS_SUCCESS_MODE(status, mode);
CHECK_STATUS_SUCCESS(status);
}

auto status = m_implementation->bulkRemove(object_type, object_count, object_id, mode, object_statuses);
Expand Down Expand Up @@ -1273,15 +1268,15 @@
{
sai_status_t status = meta_sai_validate_oid(object_type, &object_id[idx], SAI_NULL_OBJECT_ID, false);

CHECK_STATUS_SUCCESS_MODE(status, mode);
CHECK_STATUS_SUCCESS(status);

sai_object_meta_key_t meta_key = { .objecttype = object_type, .objectkey = { .key = { .object_id = object_id[idx] } } };

vmk.push_back(meta_key);

status = meta_generic_validation_set(meta_key, &attr_list[idx]);

CHECK_STATUS_SUCCESS_MODE(status, mode);
CHECK_STATUS_SUCCESS(status);
}

auto status = m_implementation->bulkSet(object_type, object_count, object_id, attr_list, mode, object_statuses);
Expand Down Expand Up @@ -1333,15 +1328,18 @@
{
sai_status_t status = meta_sai_validate_oid(object_type, &object_id[idx], SAI_NULL_OBJECT_ID, false);

CHECK_STATUS_SUCCESS_MODE(status, mode);
CHECK_STATUS_SUCCESS(status);

sai_object_meta_key_t meta_key = { .objecttype = object_type, .objectkey = { .key = { .object_id = object_id[idx] } } };

vmk.push_back(meta_key);

status = meta_generic_validation_get(meta_key, attr_count[idx], attr_list[idx]);

CHECK_STATUS_SUCCESS_MODE(status, mode);
// FIXME: This macro returns on failure.

Check notice

Code scanning / CodeQL

FIXME comment Note

FIXME comment: This macro returns on failure.
// When mode is SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR we should continue instead of return.
// This issue exists for all bulk operations.
CHECK_STATUS_SUCCESS(status);
}

auto status = m_implementation->bulkGet(object_type, object_count, object_id, attr_count, attr_list, mode, object_statuses);
Expand Down Expand Up @@ -1416,7 +1414,7 @@
{
sai_status_t status = meta_sai_validate_oid(object_type, &object_id[idx], switchId, true);

CHECK_STATUS_SUCCESS_MODE(status, mode);
CHECK_STATUS_SUCCESS(status);

// this is create, oid's don't exist yet

Expand All @@ -1426,7 +1424,7 @@

status = meta_generic_validation_create(meta_key, switchId, attr_count[idx], attr_list[idx]);

CHECK_STATUS_SUCCESS_MODE(status, mode);
CHECK_STATUS_SUCCESS(status);
}

auto status = m_implementation->bulkCreate(object_type, switchId, object_count, attr_count, attr_list, mode, object_id, object_statuses);
Expand Down
Loading