openstack/pyeclib
Code Issues Proposed changes

Merge "Clean up return/raise handling in check_metadata"

Browse Source
This commit is contained in:
Zuul
2025-08-27 21:43:45 +00:00
committed by Gerrit Code Review
parent 4c783ddebf 6e4aa2914f
commit ad4741f8a4
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/c/pyeclib_c/pyeclib_c.c
View File

@@ -1153,15 +1153,20 @@ pyeclib_c_check_metadata(PyObject *self, PyObject *args)
ret = liberasurecode_verify_stripe_metadata(pyeclib_handle->ec_desc, c_fragment_metadata_list,
num_fragments);
ret_obj = PyDict_New();
if (ret == 0) {
ret_obj = PyDict_New();
if (NULL == ret_obj) {
pyeclib_c_seterr(-ENOMEM, "pyeclib_c_check_metadata");
goto error;
}
PyDict_SetItemString(ret_obj, "status", PyLong_FromLong((long)0));
} else if (ret == -EINVALIDPARAMS) {
PyDict_SetItemString(ret_obj, "status", PyLong_FromLong((long)-EINVALIDPARAMS));
PyDict_SetItemString(ret_obj, "reason", PyString_FromString("Invalid arguments"));
goto error;
} else if (ret == -EBADCHKSUM) {
PyDict_SetItemString(ret_obj, "status", PyLong_FromLong((long)-EINVALIDPARAMS));
ret_obj = PyDict_New();
if (NULL == ret_obj) {
pyeclib_c_seterr(-ENOMEM, "pyeclib_c_check_metadata");
goto error;
}
PyDict_SetItemString(ret_obj, "status", PyLong_FromLong((long)ret));
PyDict_SetItemString(ret_obj, "reason", PyString_FromString("Bad checksum"));
PyObject *bad_chksums = PyList_New(0);
for (i = 0; i < num_fragments; i++) {
@@ -1171,14 +1176,11 @@ pyeclib_c_check_metadata(PyObject *self, PyObject *args)
}
}
PyDict_SetItemString(ret_obj, "bad_fragments", bad_chksums);
} else {
pyeclib_c_seterr(ret, "pyeclib_c_check_metadata");
}
goto exit;
error:
ret_obj = NULL;
exit:
free(c_fragment_metadata_list);
return ret_obj;

2
test/test_pyeclib_api.py
View File

@@ -500,7 +500,7 @@ class TestPyECLibDriver(unittest.TestCase):
pyeclib_driver.get_metadata(fragment))
i += 1
expected_ret_value = {"status": -206,
expected_ret_value = {"status": -205,
"reason": "Bad checksum",
"bad_fragments": fragments_to_corrupt}
self.assertEqual(