June 2019 - sanlock-devel - Fedora mailing-lists

Re: [PATCH v2 7/8] python: Add failing tests for long disk path
by Nir Soffer 25 Jun '19

25 Jun '19

On Mon, Jun 17, 2019 at 5:30 PM Pavel Bar <pbar(a)redhat.com> wrote: > > > > On Sun, Jun 16, 2019 at 11:50 PM Nir Soffer <nirsof(a)gmail.com> wrote: > >> Sanlock allow up to 1023 characters in a disk path. We used to truncate >> invalid long path silently instead of failing. Add failing tests for the >> expected behaviour. >> >> Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> >> --- >> tests/constants.py | 4 +++ >> tests/python_test.py | 79 ++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 83 insertions(+) >> >> diff --git a/tests/constants.py b/tests/constants.py >> index 4f45d13..2371fed 100644 >> --- a/tests/constants.py >> +++ b/tests/constants.py >> @@ -21,5 +21,9 @@ RINDEX_DISK_MAGIC = 0x01042018 >> # src/rindex_disk.h >> # Copied from the docs module comment. >> >> RINDEX_ENTRY_SIZE = 64 >> RINDEX_ENTRIES_SECTORS = 2000 >> + >> +# src/sanlock.h >> + >> +SANLK_PATH_LEN = 1024 >> diff --git a/tests/python_test.py b/tests/python_test.py >> index cd8a82f..5624f60 100644 >> --- a/tests/python_test.py >> +++ b/tests/python_test.py >> @@ -550,10 +550,21 @@ def >> test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding): >> >> with raises_sanlock_errno(): >> sanlock.write_resource(b"ls_name", name, disks) >> >> >> +(a)pytest.mark.xfail(reason="path truncated silently") >> +def test_write_resource_path_length(no_sanlock_daemon): >> + with pytest.raises(ValueError): >> + path = "x" * constants.SANLK_PATH_LEN >> > > What about moving the "path" initialization line 2 lines up? > Here and in many more places where "path" local variable is initialized > and then passed to a method call. > I know that from the *Java best practices* perspective it's better to > wrap only code that can throw an exception with the exception handling > block. > It is indeed better to move path out of the pytest.raises() block. However it is unlikely that we will fail with ValueError in that line. > >> + sanlock.write_resource(b"ls_name", b"res_name", [(path, 0)]) >> + >> + with raises_sanlock_errno(): >> + path = "x" * (constants.SANLK_PATH_LEN - 1) >> + sanlock.write_resource(b"ls_name", b"res_name", [(path, 0)]) >> + >> + >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_release_resource_parse_args(no_sanlock_daemon, name, filename, >> encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> disks = [(path, 0)] >> @@ -562,10 +573,21 @@ def >> test_release_resource_parse_args(no_sanlock_daemon, name, filename, encoding >> >> with raises_sanlock_errno(): >> sanlock.release(b"ls_name", name, disks) >> >> >> +(a)pytest.mark.xfail(reason="path truncated silently") >> +def test_release_resource_path_length(no_sanlock_daemon): >> + with pytest.raises(ValueError): >> + path = "x" * constants.SANLK_PATH_LEN >> + sanlock.release(b"ls_name", b"res_name", [(path, 0)]) >> + >> + with raises_sanlock_errno(): >> + path = "x" * (constants.SANLK_PATH_LEN - 1) >> + sanlock.release(b"ls_name", b"res_name", [(path, 0)]) >> + >> + >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_read_resource_owners_parse_args(no_sanlock_daemon, name, >> filename, encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> disks = [(path, 0)] >> @@ -574,10 +596,21 @@ def >> test_read_resource_owners_parse_args(no_sanlock_daemon, name, filename, enco >> >> with raises_sanlock_errno(): >> sanlock.read_resource_owners(b"ls_name", name, disks) >> >> >> +(a)pytest.mark.xfail(reason="path truncated silently") >> +def test_read_resource_owners_path_length(no_sanlock_daemon): >> + with pytest.raises(ValueError): >> + path = "x" * constants.SANLK_PATH_LEN >> + sanlock.read_resource_owners(b"ls_name", b"res_name", [(path, >> 0)]) >> + >> + with raises_sanlock_errno(): >> + path = "x" * (constants.SANLK_PATH_LEN - 1) >> + sanlock.read_resource_owners(b"ls_name", b"res_name", [(path, >> 0)]) >> + >> + >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> def test_get_hosts_parse_args(no_sanlock_daemon, name): >> with raises_sanlock_errno(): >> sanlock.get_hosts(name, 1) >> >> @@ -624,10 +657,23 @@ def >> test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): >> with raises_sanlock_errno(errno.ENOENT): >> sanlock.init_resource(b"ls_name", name, disks) >> with raises_sanlock_errno(errno.ENOENT): >> sanlock.init_resource(name, b"res_name", disks) >> >> + >> +(a)pytest.mark.xfail(reason="path truncated silently") >> +def test_init_resource_path_length(no_sanlock_daemon): >> + with pytest.raises(ValueError): >> + path = "x" * constants.SANLK_PATH_LEN >> + sanlock.init_resource(b"ls_name", b"res_name", [(path, 0)]) >> + >> + # init_resource access storage directly. >> + with raises_sanlock_errno(errno.ENAMETOOLONG): >> + path = "x" * (constants.SANLK_PATH_LEN - 1) >> + sanlock.init_resource(b"ls_name", b"res_name", [(path, 0)]) >> + >> + >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_get_alignment_parse_args(no_sanlock_daemon, filename, encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> with raises_sanlock_errno(errno.ENOENT): >> sanlock.get_alignment(path) >> @@ -643,10 +689,21 @@ def >> test_read_resource_parse_args(no_sanlock_daemon, filename, encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> with raises_sanlock_errno(): >> sanlock.read_resource(path) >> >> >> +(a)pytest.mark.xfail(reason="path truncated silently") >> +def test_read_resource_path_length(no_sanlock_daemon): >> + with pytest.raises(ValueError): >> + path = "x" * constants.SANLK_PATH_LEN >> + sanlock.read_resource(path) >> + >> + with raises_sanlock_errno(): >> + path = "x" * (constants.SANLK_PATH_LEN - 1) >> + sanlock.read_resource(path) >> + >> + >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_request_parse_args(no_sanlock_daemon, name, filename, encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> disks = [(path, 0)] >> @@ -656,10 +713,21 @@ def test_request_parse_args(no_sanlock_daemon, >> name, filename, encoding): >> >> with raises_sanlock_errno(): >> sanlock.request(name, b"res_name", disks) >> >> >> +(a)pytest.mark.xfail(reason="path truncated silently") >> +def test_request_path_length(no_sanlock_daemon): >> + with pytest.raises(ValueError): >> + path = "x" * constants.SANLK_PATH_LEN >> + sanlock.request(b"ls_name", b"res_name", [(path, 0)]) >> + >> + with raises_sanlock_errno(): >> + path = "x" * (constants.SANLK_PATH_LEN - 1) >> + sanlock.request(b"ls_name", b"res_name", [(path, 0)]) >> + >> + >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_acquire_parse_args(no_sanlock_daemon, name, filename, encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> disks = [(path, 0)] >> @@ -667,5 +735,16 @@ def test_acquire_parse_args(no_sanlock_daemon, name, >> filename, encoding): >> with raises_sanlock_errno(): >> sanlock.acquire(b"ls_name", name, disks, pid=os.getpid()) >> >> with raises_sanlock_errno(): >> sanlock.acquire(name, b"res_name", disks, pid=os.getpid()) >> + >> + >> +(a)pytest.mark.xfail(reason="path truncated silently") >> +def test_acquire_path_length(no_sanlock_daemon): >> + with pytest.raises(ValueError): >> + path = "x" * constants.SANLK_PATH_LEN >> + sanlock.acquire(b"ls_name", b"res_name", [(path, 0)], >> pid=os.getpid()) >> + >> + with raises_sanlock_errno(): >> + path = "x" * (constants.SANLK_PATH_LEN - 1) >> + sanlock.acquire(b"ls_name", b"res_name", [(path, 0)], >> pid=os.getpid()) >> -- >> 2.17.2 >> >>

1 1

[sanlock] 08/08: python: Fail with ValueError if disk path is too long
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 53f7f0284c084ac2e4542fd1f71d0406075adb5d Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 22:36:39 2019 +0300 python: Fail with ValueError if disk path is too long Previously if a path was too long, we truncated the path silently. This probably fail when sanlock try to access non-existing path with "No such path or directory" error. If you are unlucky, this could try to access the wrong path, failing with bogus error, returning wrong data, or worse, writing a resource into the wrong location, destroying existing data. Now we fail immediately with: ValueError: Path is too long: '/too/long/path/...' Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 17 +++++++++++++++++ tests/python_test.py | 7 ------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index ca3713d..7c50aba 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -146,6 +146,17 @@ pystring_as_cstring(PyObject *obj) } static int +validate_path(PyObject *path) +{ + if (PyBytes_Size(path) > SANLK_PATH_LEN - 1) { + set_error(PyExc_ValueError, "Path is too long: %s", path); + return 0; + } + + return 1; +} + +static int parse_single_disk(PyObject* disk, struct sanlk_disk* res_disk) { int rv = 0; @@ -163,6 +174,9 @@ parse_single_disk(PyObject* disk, struct sanlk_disk* res_disk) goto finally; } + if (!validate_path(path)) + goto finally; + strncpy(res_disk->path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); res_disk->offset = offset; rv = 1; @@ -656,6 +670,9 @@ py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) goto finally; } + if (!validate_path(path)) + goto finally; + /* prepare the resource disk path */ strncpy(res->disks[0].path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); diff --git a/tests/python_test.py b/tests/python_test.py index 4ea1589..719bcb6 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -601,7 +601,6 @@ def test_write_resource_parse_args( sanlock.write_resource(b"ls_name", name, disks) -(a)pytest.mark.xfail(reason="path truncated silently") def test_write_resource_path_length(no_sanlock_daemon): path = "x" * constants.SANLK_PATH_LEN with pytest.raises(ValueError): @@ -625,7 +624,6 @@ def test_release_resource_parse_args( sanlock.release(b"ls_name", name, disks) -(a)pytest.mark.xfail(reason="path truncated silently") def test_release_resource_path_length(no_sanlock_daemon): path = "x" * constants.SANLK_PATH_LEN with pytest.raises(ValueError): @@ -649,7 +647,6 @@ def test_read_resource_owners_parse_args( sanlock.read_resource_owners(b"ls_name", name, disks) -(a)pytest.mark.xfail(reason="path truncated silently") def test_read_resource_owners_path_length(no_sanlock_daemon): path = "x" * constants.SANLK_PATH_LEN with pytest.raises(ValueError): @@ -712,7 +709,6 @@ def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): sanlock.init_resource(name, b"res_name", disks) -(a)pytest.mark.xfail(reason="path truncated silently") def test_init_resource_path_length(no_sanlock_daemon): path = "x" * constants.SANLK_PATH_LEN with pytest.raises(ValueError): @@ -745,7 +741,6 @@ def test_read_resource_parse_args(no_sanlock_daemon, filename, encoding): sanlock.read_resource(path) -(a)pytest.mark.xfail(reason="path truncated silently") def test_read_resource_path_length(no_sanlock_daemon): path = "x" * constants.SANLK_PATH_LEN with pytest.raises(ValueError): @@ -769,7 +764,6 @@ def test_request_parse_args(no_sanlock_daemon, name, filename, encoding): sanlock.request(name, b"res_name", disks) -(a)pytest.mark.xfail(reason="path truncated silently") def test_request_path_length(no_sanlock_daemon): path = "x" * constants.SANLK_PATH_LEN with pytest.raises(ValueError): @@ -793,7 +787,6 @@ def test_acquire_parse_args(no_sanlock_daemon, name, filename, encoding): sanlock.acquire(name, b"res_name", disks, pid=os.getpid()) -(a)pytest.mark.xfail(reason="path truncated silently") def test_acquire_path_length(no_sanlock_daemon): path = "x" * constants.SANLK_PATH_LEN with pytest.raises(ValueError): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 07/08: python: Add failing tests for long disk path
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit b0634b270bdeb88e2301859e46a80a9be95c89d3 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 22:33:16 2019 +0300 python: Add failing tests for long disk path Sanlock allow up to 1023 characters in a disk path. We used to truncate invalid long path silently instead of failing. Add failing tests for the expected behaviour. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/constants.py | 4 +++ tests/python_test.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/tests/constants.py b/tests/constants.py index 3d9c332..4a98b3d 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -27,3 +27,7 @@ RINDEX_ENTRIES_SECTORS = 2000 # src/sanlock_rv.h SANLK_LEADER_MAGIC = -223 + +# src/sanlock.h + +SANLK_PATH_LEN = 1024 diff --git a/tests/python_test.py b/tests/python_test.py index 86e60b1..4ea1589 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -601,6 +601,17 @@ def test_write_resource_parse_args( sanlock.write_resource(b"ls_name", name, disks) +(a)pytest.mark.xfail(reason="path truncated silently") +def test_write_resource_path_length(no_sanlock_daemon): + path = "x" * constants.SANLK_PATH_LEN + with pytest.raises(ValueError): + sanlock.write_resource(b"ls_name", b"res_name", [(path, 0)]) + + path = "x" * (constants.SANLK_PATH_LEN - 1) + with raises_sanlock_errno(): + sanlock.write_resource(b"ls_name", b"res_name", [(path, 0)]) + + @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_release_resource_parse_args( @@ -614,6 +625,17 @@ def test_release_resource_parse_args( sanlock.release(b"ls_name", name, disks) +(a)pytest.mark.xfail(reason="path truncated silently") +def test_release_resource_path_length(no_sanlock_daemon): + path = "x" * constants.SANLK_PATH_LEN + with pytest.raises(ValueError): + sanlock.release(b"ls_name", b"res_name", [(path, 0)]) + + path = "x" * (constants.SANLK_PATH_LEN - 1) + with raises_sanlock_errno(): + sanlock.release(b"ls_name", b"res_name", [(path, 0)]) + + @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_read_resource_owners_parse_args( @@ -627,6 +649,17 @@ def test_read_resource_owners_parse_args( sanlock.read_resource_owners(b"ls_name", name, disks) +(a)pytest.mark.xfail(reason="path truncated silently") +def test_read_resource_owners_path_length(no_sanlock_daemon): + path = "x" * constants.SANLK_PATH_LEN + with pytest.raises(ValueError): + sanlock.read_resource_owners(b"ls_name", b"res_name", [(path, 0)]) + + path = "x" * (constants.SANLK_PATH_LEN - 1) + with raises_sanlock_errno(): + sanlock.read_resource_owners(b"ls_name", b"res_name", [(path, 0)]) + + @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) def test_get_hosts_parse_args(no_sanlock_daemon, name): with raises_sanlock_errno(): @@ -679,6 +712,18 @@ def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): sanlock.init_resource(name, b"res_name", disks) +(a)pytest.mark.xfail(reason="path truncated silently") +def test_init_resource_path_length(no_sanlock_daemon): + path = "x" * constants.SANLK_PATH_LEN + with pytest.raises(ValueError): + sanlock.init_resource(b"ls_name", b"res_name", [(path, 0)]) + + # init_resource access storage directly. + path = "x" * (constants.SANLK_PATH_LEN - 1) + with raises_sanlock_errno(errno.ENAMETOOLONG): + sanlock.init_resource(b"ls_name", b"res_name", [(path, 0)]) + + @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_get_alignment_parse_args(no_sanlock_daemon, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) @@ -700,6 +745,17 @@ def test_read_resource_parse_args(no_sanlock_daemon, filename, encoding): sanlock.read_resource(path) +(a)pytest.mark.xfail(reason="path truncated silently") +def test_read_resource_path_length(no_sanlock_daemon): + path = "x" * constants.SANLK_PATH_LEN + with pytest.raises(ValueError): + sanlock.read_resource(path) + + path = "x" * (constants.SANLK_PATH_LEN - 1) + with raises_sanlock_errno(): + sanlock.read_resource(path) + + @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_request_parse_args(no_sanlock_daemon, name, filename, encoding): @@ -713,6 +769,17 @@ def test_request_parse_args(no_sanlock_daemon, name, filename, encoding): sanlock.request(name, b"res_name", disks) +(a)pytest.mark.xfail(reason="path truncated silently") +def test_request_path_length(no_sanlock_daemon): + path = "x" * constants.SANLK_PATH_LEN + with pytest.raises(ValueError): + sanlock.request(b"ls_name", b"res_name", [(path, 0)]) + + path = "x" * (constants.SANLK_PATH_LEN - 1) + with raises_sanlock_errno(): + sanlock.request(b"ls_name", b"res_name", [(path, 0)]) + + @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_acquire_parse_args(no_sanlock_daemon, name, filename, encoding): @@ -724,3 +791,14 @@ def test_acquire_parse_args(no_sanlock_daemon, name, filename, encoding): with raises_sanlock_errno(): sanlock.acquire(name, b"res_name", disks, pid=os.getpid()) + + +(a)pytest.mark.xfail(reason="path truncated silently") +def test_acquire_path_length(no_sanlock_daemon): + path = "x" * constants.SANLK_PATH_LEN + with pytest.raises(ValueError): + sanlock.acquire(b"ls_name", b"res_name", [(path, 0)], pid=os.getpid()) + + path = "x" * (constants.SANLK_PATH_LEN - 1) + with raises_sanlock_errno(): + sanlock.acquire(b"ls_name", b"res_name", [(path, 0)], pid=os.getpid()) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 06/08: python: Add missing arg parsing tests
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 7874592fcd604e594d84e070496eedb0d04ed1de Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 22:30:56 2019 +0300 python: Add missing arg parsing tests Add argument parsing tests for sanlock.acquire() and sanlock.request(). Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/python_test.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/python_test.py b/tests/python_test.py index 0f70a6a..86e60b1 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -11,6 +11,7 @@ from __future__ import absolute_import import errno import io +import os import time from contextlib import contextmanager @@ -697,3 +698,29 @@ def test_read_resource_parse_args(no_sanlock_daemon, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): sanlock.read_resource(path) + + +(a)pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_request_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) + disks = [(path, 0)] + + with raises_sanlock_errno(): + sanlock.request(b"ls_name", name, disks) + + with raises_sanlock_errno(): + sanlock.request(name, b"res_name", disks) + + +(a)pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_acquire_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) + disks = [(path, 0)] + + with raises_sanlock_errno(): + sanlock.acquire(b"ls_name", name, disks, pid=os.getpid()) + + with raises_sanlock_errno(): + sanlock.acquire(name, b"res_name", disks, pid=os.getpid()) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 05/08: python: Replace memset() with initializer
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 44763e5669a1a758ec2f8e4cbc80969429d17a1c Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 21:16:13 2019 +0300 python: Replace memset() with initializer C99 ensures that all fields of a struct are initialized to zero when initializing to {0} and all characters are initialized to zero when initializing to ""; Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 6824e01..ca3713d 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -343,14 +343,13 @@ py_get_alignment(PyObject *self __unused, PyObject *args) { int rv = -1; PyObject *path = NULL; - struct sanlk_disk disk; + struct sanlk_disk disk = {0}; /* parse python tuple */ if (!PyArg_ParseTuple(args, "O&", pypath_converter, &path)) { goto finally; } - memset(&disk, 0, sizeof(struct sanlk_disk)); strncpy(disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* get device alignment (gil disabled) */ @@ -420,14 +419,11 @@ py_init_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) int rv = -1, max_hosts = 0, num_hosts = 0, use_aio = 1; PyObject *lockspace = NULL; PyObject *path = NULL; - struct sanlk_lockspace ls; + struct sanlk_lockspace ls = {0}; static char *kwlist[] = {"lockspace", "path", "offset", "max_hosts", "num_hosts", "use_aio", NULL}; - /* initialize lockspace structure */ - memset(&ls, 0, sizeof(struct sanlk_lockspace)); - /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&|kiii", kwlist, convert_to_pybytes, &lockspace, pypath_converter, &path, &ls.host_id_disk.offset, @@ -527,14 +523,11 @@ py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) uint32_t io_timeout = 0; PyObject *lockspace = NULL; PyObject *path = NULL; - struct sanlk_lockspace ls; + struct sanlk_lockspace ls = {0}; static char *kwlist[] = {"lockspace", "path", "offset", "max_hosts", "iotimeout", "align", "sector", NULL}; - /* initialize lockspace structure */ - memset(&ls, 0, sizeof(struct sanlk_lockspace)); - /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&|kiIli", kwlist, convert_to_pybytes, &lockspace, pypath_converter, &path, &ls.host_id_disk.offset, @@ -585,14 +578,11 @@ py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) long align = ALIGNMENT_1M; uint32_t io_timeout = 0; PyObject *path = NULL; - struct sanlk_lockspace ls; + struct sanlk_lockspace ls = {0}; PyObject *ls_info = NULL; static char *kwlist[] = {"path", "offset", "align", "sector", NULL}; - /* initialize lockspace structure */ - memset(&ls, 0, sizeof(struct sanlk_lockspace)); - /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&|kli", kwlist, pypath_converter, &path, &ls.host_id_disk.offset, &align, &sector)) { @@ -795,14 +785,11 @@ py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) uint32_t iotimeout = 0; PyObject *lockspace = NULL; PyObject *path = NULL; - struct sanlk_lockspace ls; + struct sanlk_lockspace ls = {0}; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", "iotimeout", "wait", NULL}; - /* initialize lockspace structure */ - memset(&ls, 0, sizeof(struct sanlk_lockspace)); - /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|kIi", kwlist, convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, @@ -852,14 +839,11 @@ py_inq_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) int rv = BIND_ERROR, waitrs = 0, flags = 0; PyObject *lockspace = NULL; PyObject *path = NULL; - struct sanlk_lockspace ls; + struct sanlk_lockspace ls = {0}; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", "wait", NULL}; - /* initialize lockspace structure */ - memset(&ls, 0, sizeof(struct sanlk_lockspace)); - /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|ki", kwlist, convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, @@ -916,14 +900,11 @@ py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) int wait = 1; PyObject *lockspace = NULL; PyObject *path = NULL; - struct sanlk_lockspace ls; + struct sanlk_lockspace ls = {0}; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", "wait", "unused", NULL}; - /* initialize lockspace structure */ - memset(&ls, 0, sizeof(struct sanlk_lockspace)); - /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|kii", kwlist, convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, @@ -1407,7 +1388,7 @@ py_killpath(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv = -1, num_args, sanlockfd = -1; size_t kplen = 0; - char kpargs[SANLK_HELPER_ARGS_LEN]; + char kpargs[SANLK_HELPER_ARGS_LEN] = ""; PyObject *path = NULL; PyObject *argslist; @@ -1426,7 +1407,6 @@ py_killpath(PyObject *self __unused, PyObject *args, PyObject *keywds) } num_args = PyList_Size(argslist); - memset(kpargs, 0, SANLK_HELPER_ARGS_LEN); /* creating the arguments string from a python list */ for (int i = 0; i < num_args; i++) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 04/08: python: Extract create_resource() helper
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit ca203015b1206616ba1a1734900346357acb75e2 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 21:01:56 2019 +0300 python: Extract create_resource() helper Replace duplicate code for allocating and initializing sanlk_resource struct with a helper. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 5c2fd1a..6824e01 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -172,25 +172,34 @@ finally: return rv; } +static struct sanlk_resource * +create_resource(int num_disks) +{ + size_t size = sizeof(struct sanlk_resource) + + sizeof(struct sanlk_disk) * num_disks; + + struct sanlk_resource *res = calloc(1, size); + if (res == NULL) { + PyErr_NoMemory(); + return NULL; + } + + res->num_disks = num_disks; + + return res; +} + static int parse_disks(PyObject *obj, struct sanlk_resource **res_ret) { - int num_disks, res_len; + int num_disks; struct sanlk_resource *res; num_disks = PyList_Size(obj); - res_len = sizeof(struct sanlk_resource) + - (sizeof(struct sanlk_disk) * num_disks); - res = malloc(res_len); - - if (res == NULL) { - PyErr_NoMemory(); + res = create_resource(num_disks); + if (res == NULL) return -1; - } - - memset(res, 0, res_len); - res->num_disks = num_disks; for (int i = 0; i < num_disks; i++) { PyObject *disk = PyList_GetItem(obj,i); @@ -639,7 +648,7 @@ Sector can be one of (512, 4096)."); static PyObject * py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, res_len, sector = SECTOR_SIZE_512; + int rv = -1, sector = SECTOR_SIZE_512; long align = ALIGNMENT_1M; PyObject *path = NULL; struct sanlk_resource *res; @@ -647,18 +656,9 @@ py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) static char *kwlist[] = {"path", "offset", "align", "sector", NULL}; - /* allocate the needed memory for the resource and one disk */ - res_len = sizeof(struct sanlk_resource) + sizeof(struct sanlk_disk); - res = malloc(res_len); - - if (res == NULL) { - PyErr_NoMemory(); + res = create_resource(1 /* num_disks */); + if (res == NULL) return NULL; - } - - /* initialize resource and disk structures */ - memset(res, 0, res_len); - res->num_disks = 1; /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&|kli", kwlist, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 03/08: python: Streamline initexception
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit f5c5b73895b68d8c6fd032a4fd5f98a9e5fb8a4a Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 20:15:36 2019 +0300 python: Streamline initexception When we create the sanlock exception we create a function, create a method from the function, create a dict from the method, and finally create an exception from the dict. This simple flow does not require goto for cleanup. Creating a dict is simpler and less error prone using Py_BuildValue(). When we finish with unused pointers, it is safer to set them to NULL using Py_CLEAR(), ensuring that we don't access freed memory. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 21a7a76..5c2fd1a 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1743,29 +1743,22 @@ sanlock_exception = { static PyObject * initexception(void) { - int rv; - PyObject *dict, *func, *meth, *excp = NULL; - - if ((dict = PyDict_New()) == NULL) - goto exit_fail; - - if ((func = PyCFunction_New(&sanlock_exception, NULL)) == NULL) - goto exit_fail; + PyObject *func = PyCFunction_New(&sanlock_exception, NULL); + if (func == NULL) + return NULL; - meth = PyObject_CallFunction((PyObject *) &PyProperty_Type, "O", func); - Py_DECREF(func); + PyObject *meth = PyObject_CallFunction((PyObject *) &PyProperty_Type, "O", func); + Py_CLEAR(func); if (meth == NULL) - goto exit_fail; - - rv = PyDict_SetItemString(dict, sanlock_exception.ml_name, meth); - Py_DECREF(meth); - if (rv < 0) - goto exit_fail; + return NULL; - excp = PyErr_NewException("sanlock.SanlockException", NULL, dict); + PyObject *dict = Py_BuildValue("{s:O}", sanlock_exception.ml_name, meth); + Py_CLEAR(meth); + if (dict == NULL) + return NULL; -exit_fail: - Py_XDECREF(dict); + PyObject *excp = PyErr_NewException("sanlock.SanlockException", NULL, dict); + Py_CLEAR(dict); return excp; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/08: python: Use Py_CLEAR
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 304e928430ce3ce77985281cae4fb19905884552 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 19:50:44 2019 +0300 python: Use Py_CLEAR Instead of: Py_DECREF(obj); obj = NULL; We can use: Py_CLEAR(obj); Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index e740f89..21a7a76 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1563,8 +1563,7 @@ py_get_event(PyObject *self __unused, PyObject *args) if (PyList_Append(events, item) != 0) goto exit_fail; - Py_DECREF(item); - item = NULL; + Py_CLEAR(item); } return events; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/08: python: Use Py_BuildValue to create event dicts
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit cacc09c02d2c0824ffbb0df9c48ecae703f8da60 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Jun 16 19:44:43 2019 +0300 python: Use Py_BuildValue to create event dicts Replace complex and error prone code to build event dict with Py_BuildValue(). Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 58 +++++++++----------------------------------------------- 1 file changed, 9 insertions(+), 49 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 9192395..e740f89 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1527,7 +1527,6 @@ py_get_event(PyObject *self __unused, PyObject *args) uint64_t from_generation; PyObject *events = NULL; PyObject *item = NULL; - PyObject *value = NULL; int rv; if (!PyArg_ParseTuple(args, "i", &fd)) @@ -1549,55 +1548,16 @@ py_get_event(PyObject *self __unused, PyObject *args) goto exit_fail; } - if ((item = PyDict_New()) == NULL) - goto exit_fail; + item = Py_BuildValue( + "{s:K,s:K,s:K,s:K,s:K,s:K}", + "from_host_id", from_host_id, + "from_generation", from_generation, + "host_id", he.host_id, + "generation", he.generation, + "event", he.event, + "data", he.data); - /* from_host_id */ - if ((value = PyLong_FromUnsignedLongLong(from_host_id)) == NULL) - goto exit_fail; - rv = PyDict_SetItemString(item, "from_host_id", value); - Py_DECREF(value); - if (rv != 0) - goto exit_fail; - - /* from_generation */ - if ((value = PyLong_FromUnsignedLongLong(from_generation)) == NULL) - goto exit_fail; - rv = PyDict_SetItemString(item, "from_generation", value); - Py_DECREF(value); - if (rv != 0) - goto exit_fail; - - /* host_id */ - if ((value = PyLong_FromUnsignedLongLong(he.host_id)) == NULL) - goto exit_fail; - rv = PyDict_SetItemString(item, "host_id", value); - Py_DECREF(value); - if (rv != 0) - goto exit_fail; - - /* generation */ - if ((value = PyLong_FromUnsignedLongLong(he.generation)) == NULL) - goto exit_fail; - rv = PyDict_SetItemString(item, "generation", value); - Py_DECREF(value); - if (rv != 0) - goto exit_fail; - - /* event */ - if ((value = PyLong_FromUnsignedLongLong(he.event)) == NULL) - goto exit_fail; - rv = PyDict_SetItemString(item, "event", value); - Py_DECREF(value); - if (rv != 0) - goto exit_fail; - - /* data */ - if ((value = PyLong_FromUnsignedLongLong(he.data)) == NULL) - goto exit_fail; - rv = PyDict_SetItemString(item, "data", value); - Py_DECREF(value); - if (rv != 0) + if (item == NULL) goto exit_fail; if (PyList_Append(events, item) != 0) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 14/14: python: Unify resource variables names
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 9ad356bbc2f411edd497a196206ae00efa2e2bd2 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 23:46:52 2019 +0300 python: Unify resource variables names Some code was using "rs" and some "res". Unify all code to use "res". This is also the term used in the tests. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 58 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 12e2195..9192395 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -639,46 +639,46 @@ Sector can be one of (512, 4096)."); static PyObject * py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, rs_len, sector = SECTOR_SIZE_512; + int rv = -1, res_len, sector = SECTOR_SIZE_512; long align = ALIGNMENT_1M; PyObject *path = NULL; - struct sanlk_resource *rs; - PyObject *rs_info = NULL; + struct sanlk_resource *res; + PyObject *res_info = NULL; static char *kwlist[] = {"path", "offset", "align", "sector", NULL}; /* allocate the needed memory for the resource and one disk */ - rs_len = sizeof(struct sanlk_resource) + sizeof(struct sanlk_disk); - rs = malloc(rs_len); + res_len = sizeof(struct sanlk_resource) + sizeof(struct sanlk_disk); + res = malloc(res_len); - if (rs == NULL) { + if (res == NULL) { PyErr_NoMemory(); return NULL; } /* initialize resource and disk structures */ - memset(rs, 0, rs_len); - rs->num_disks = 1; + memset(res, 0, res_len); + res->num_disks = 1; /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&|kli", kwlist, - pypath_converter, &path, &(rs->disks[0].offset), &align, &sector)) { + pypath_converter, &path, &(res->disks[0].offset), &align, &sector)) { goto finally; } /* prepare the resource disk path */ - strncpy(rs->disks[0].path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); + strncpy(res->disks[0].path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* set alignment/sector flags */ - if (add_align_flag(align, &rs->flags) == -1) + if (add_align_flag(align, &res->flags) == -1) goto finally; - if (add_sector_flag(sector, &rs->flags) == -1) + if (add_sector_flag(sector, &res->flags) == -1) goto finally; /* read sanlock resource (gil disabled) */ Py_BEGIN_ALLOW_THREADS - rv = sanlock_read_resource(rs, 0); + rv = sanlock_read_resource(res, 0); Py_END_ALLOW_THREADS if (rv != 0) { @@ -687,26 +687,26 @@ py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) } /* prepare the dictionary holding the information */ - rs_info = Py_BuildValue( + res_info = Py_BuildValue( #if PY_MAJOR_VERSION == 2 "{s:s,s:s,s:K}", #else "{s:y,s:y,s:K}", #endif - "lockspace", rs->lockspace_name, - "resource", rs->name, - "version", rs->lver); - if (rs_info == NULL) + "lockspace", res->lockspace_name, + "resource", res->name, + "version", res->lver); + if (res_info == NULL) goto finally; finally: - free(rs); + free(res); Py_XDECREF(path); if (rv != 0) { - Py_XDECREF(rs_info); + Py_XDECREF(res_info); return NULL; } - return rs_info; + return res_info; } /* write_resource */ @@ -726,7 +726,7 @@ py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) int rv = -1, max_hosts = 0, num_hosts = 0, clear = 0, sector = SECTOR_SIZE_512; long align = ALIGNMENT_1M; PyObject *lockspace = NULL, *resource = NULL; - struct sanlk_resource *rs = NULL; + struct sanlk_resource *res = NULL; PyObject *disks; uint32_t flags = 0; @@ -741,19 +741,19 @@ py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) } /* parse and check sanlock resource */ - if (parse_disks(disks, &rs) < 0) { + if (parse_disks(disks, &res) < 0) { goto finally; } /* prepare sanlock names */ - strncpy(rs->lockspace_name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); - strncpy(rs->name, PyBytes_AsString(resource), SANLK_NAME_LEN); + strncpy(res->lockspace_name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); + strncpy(res->name, PyBytes_AsString(resource), SANLK_NAME_LEN); /* set alignment/sector flags */ - if (add_align_flag(align, &rs->flags) == -1) + if (add_align_flag(align, &res->flags) == -1) goto finally; - if (add_sector_flag(sector, &rs->flags) == -1) + if (add_sector_flag(sector, &res->flags) == -1) goto finally; if (clear) { @@ -762,7 +762,7 @@ py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) /* init sanlock resource (gil disabled) */ Py_BEGIN_ALLOW_THREADS - rv = sanlock_write_resource(rs, max_hosts, num_hosts, flags); + rv = sanlock_write_resource(res, max_hosts, num_hosts, flags); Py_END_ALLOW_THREADS if (rv != 0) { @@ -773,7 +773,7 @@ py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) finally: Py_XDECREF(lockspace); Py_XDECREF(resource); - free(rs); + free(res); if (rv != 0) return NULL; Py_RETURN_NONE; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 13/14: python: Unify indentation
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 59367ebaea8d37bc34173e3586d898e0d969bb0f Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 23:34:06 2019 +0300 python: Unify indentation Some tabs sneaked into the module before we added the vim modeline. Some Py_BuildValue calls used too much indentation. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 556627c..12e2195 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -216,13 +216,13 @@ add_sector_flag(int sector, uint32_t *flags) switch (sector) { case SECTOR_SIZE_512: *flags |= SANLK_LSF_SECTOR512; - break; + break; case SECTOR_SIZE_4K: *flags |= SANLK_LSF_SECTOR4K; - break; + break; default: - PyErr_Format(PyExc_ValueError, "Invalid sector value: %d", sector); - return -1; + PyErr_Format(PyExc_ValueError, "Invalid sector value: %d", sector); + return -1; } return 0; } @@ -240,19 +240,19 @@ add_align_flag(long align, uint32_t *flags) switch (align) { case ALIGNMENT_1M: *flags |= SANLK_RES_ALIGN1M; - break; + break; case ALIGNMENT_2M: *flags |= SANLK_RES_ALIGN2M; - break; + break; case ALIGNMENT_4M: *flags |= SANLK_RES_ALIGN4M; - break; + break; case ALIGNMENT_8M: *flags |= SANLK_RES_ALIGN8M; - break; + break; default: - PyErr_Format(PyExc_ValueError, "Invalid align value: %ld", align); - return -1; + PyErr_Format(PyExc_ValueError, "Invalid align value: %ld", align); + return -1; } return 0; } @@ -613,12 +613,12 @@ py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) /* fill the information dictionary */ ls_info = Py_BuildValue( #if PY_MAJOR_VERSION == 2 - "{s:s,s:I}", + "{s:s,s:I}", #else - "{s:y,s:I}", + "{s:y,s:I}", #endif - "lockspace", ls.name, - "iotimeout", io_timeout); + "lockspace", ls.name, + "iotimeout", io_timeout); if (ls_info == NULL) goto finally; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 12/14: python: Streamline py_get_lockspaces()
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit e5d3bb565ec68197b5aa5f5eee77f72803e75e6b Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 23:23:03 2019 +0300 python: Streamline py_get_lockspaces() py_get_lockspaces() was using the same error prone error cleanup as hosts_to_list(), mixed with code to call sanlock, to make the code harder to follow. Extract lockspaces_to_list() helper, implemented exactly like hosts_to_list. This simplify py_get_lockspaces() and allow using the simpler finally pattern we used in other functions. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 76 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 4f80379..556627c 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -963,6 +963,42 @@ finally: Py_RETURN_NONE; } +static PyObject * +lockspaces_to_list(struct sanlk_lockspace *lss, int lss_count) +{ + PyObject *ls_list = PyList_New(lss_count); + if (ls_list == NULL) + goto exit_fail; + + for (int i = 0; i < lss_count; i++) { + PyObject *ls_entry = Py_BuildValue( +#if PY_MAJOR_VERSION == 2 + "{s:s,s:K,s:s,s:K,s:I}", +#else + "{s:y,s:K,s:s,s:K,s:I}", +#endif + "lockspace", lss[i].name, + "host_id", lss[i].host_id, + "path", lss[i].host_id_disk.path, + "offset", lss[i].host_id_disk.offset, + "flags", lss[i].flags); + if (ls_entry == NULL) + goto exit_fail; + + /* Steals reference to ls_entry. */ + if (PyList_SetItem(ls_list, i, ls_entry) != 0) { + Py_DECREF(ls_entry); + goto exit_fail; + } + } + + return ls_list; + +exit_fail: + Py_XDECREF(ls_list); + return NULL; +} + /* get_lockspaces */ PyDoc_STRVAR(pydoc_get_lockspaces, "\ get_lockspaces() -> list\n\ @@ -977,7 +1013,7 @@ py_get_lockspaces(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv, lss_count; struct sanlk_lockspace *lss = NULL; - PyObject *ls_list = NULL, *ls_entry = NULL; + PyObject *ls_list = NULL; /* get all the lockspaces (gil disabled) */ Py_BEGIN_ALLOW_THREADS @@ -986,46 +1022,14 @@ py_get_lockspaces(PyObject *self __unused, PyObject *args, PyObject *keywds) if (rv < 0) { set_sanlock_error(rv, "Sanlock get lockspaces failure"); - goto exit_fail; + goto finally; } - /* prepare the dictionary holding the information */ - if ((ls_list = PyList_New(0)) == NULL) - goto exit_fail; + ls_list = lockspaces_to_list(lss, lss_count); - for (int i = 0; i < lss_count; i++) { - - /* fill the dictionary information */ - ls_entry = Py_BuildValue( -#if PY_MAJOR_VERSION == 2 - "{s:s,s:K,s:s,s:K,s:I}", -#else - "{s:y,s:K,s:s,s:K,s:I}", -#endif - "lockspace", lss[i].name, - "host_id", lss[i].host_id, - "path", lss[i].host_id_disk.path, - "offset", lss[i].host_id_disk.offset, - "flags", lss[i].flags); - if (ls_entry == NULL) - goto exit_fail; - - if (PyList_Append(ls_list, ls_entry) != 0) - goto exit_fail; - - Py_DECREF(ls_entry); - } - - /* success */ +finally: free(lss); return ls_list; - - /* failure */ -exit_fail: - free(lss); - Py_XDECREF(ls_entry); - Py_XDECREF(ls_list); - return NULL; } /* get_hosts */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 11/14: python: Streamline hosts_to_list
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 80c7effc57e492fed86c50040a6ad032346283ef Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 23:00:18 2019 +0300 python: Streamline hosts_to_list This function used error prone style, using local loop variable in the scope of the function, making cleanup more risky. Move ls_entry info the loop scope, and use PyList_SetItem(), stealing the reference to ls_entry, so we need to decrease the reference count only on errors. To use PyList_SetItem() we need to allocate the entire list upfront, which is good idea anyway. While refactoring, remove some useless and wrong comments. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 4c3e0a0..4f80379 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -271,36 +271,31 @@ set_error(PyObject* exception, const char* format, PyObject* obj) static PyObject * hosts_to_list(struct sanlk_host *hss, int hss_count) { - PyObject *ls_list = NULL, *ls_entry = NULL; - - /* prepare the dictionary holding the information */ - if ((ls_list = PyList_New(0)) == NULL) + PyObject *ls_list = PyList_New(hss_count); + if (ls_list == NULL) goto exit_fail; for (int i = 0; i < hss_count; i++) { - - /* fill the dictionary information */ - ls_entry = Py_BuildValue( - "{s:K,s:K,s:K,s:I,s:I}", - "host_id", hss[i].host_id, - "generation", hss[i].generation, - "timestamp", hss[i].timestamp, - "io_timeout", hss[i].io_timeout, - "flags", hss[i].flags); + PyObject *ls_entry = Py_BuildValue( + "{s:K,s:K,s:K,s:I,s:I}", + "host_id", hss[i].host_id, + "generation", hss[i].generation, + "timestamp", hss[i].timestamp, + "io_timeout", hss[i].io_timeout, + "flags", hss[i].flags); if (ls_entry == NULL) goto exit_fail; - if (PyList_Append(ls_list, ls_entry) != 0) + /* Steals reference to ls_entry. */ + if (PyList_SetItem(ls_list, i, ls_entry) != 0) { + Py_DECREF(ls_entry); goto exit_fail; - - Py_DECREF(ls_entry); + } } return ls_list; - /* failure */ exit_fail: - Py_XDECREF(ls_entry); Py_XDECREF(ls_list); return NULL; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 10/14: python: Remove unneeded check for null
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 806d671c54a003b3908609ac768730d0f57d6ed0 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 22:01:30 2019 +0300 python: Remove unneeded check for null When calling free() we don't need to check if a point is NULL. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/sanlock.c b/python/sanlock.c index ed9de0f..4c3e0a0 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1027,7 +1027,7 @@ py_get_lockspaces(PyObject *self __unused, PyObject *args, PyObject *keywds) /* failure */ exit_fail: - if (lss) free(lss); + free(lss); Py_XDECREF(ls_entry); Py_XDECREF(ls_list); return NULL; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 09/14: python: Limit the scope of for loop counter
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit ed46eba762f0b7578409f2e16bd58fa740c0a536 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 21:53:58 2019 +0300 python: Limit the scope of for loop counter Replace: int i; for (i = 0; ...) With: for (int i = 0; ...) This removes unneeded variable from the function, and limit the scope of the counter to the loop. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 2216322..ed9de0f 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -175,7 +175,7 @@ finally: static int parse_disks(PyObject *obj, struct sanlk_resource **res_ret) { - int i, num_disks, res_len; + int num_disks, res_len; struct sanlk_resource *res; num_disks = PyList_Size(obj); @@ -192,7 +192,7 @@ parse_disks(PyObject *obj, struct sanlk_resource **res_ret) memset(res, 0, res_len); res->num_disks = num_disks; - for (i = 0; i < num_disks; i++) { + for (int i = 0; i < num_disks; i++) { PyObject *disk = PyList_GetItem(obj,i); if (!parse_single_disk(disk, &(res->disks[i]))) { @@ -271,14 +271,13 @@ set_error(PyObject* exception, const char* format, PyObject* obj) static PyObject * hosts_to_list(struct sanlk_host *hss, int hss_count) { - int i; PyObject *ls_list = NULL, *ls_entry = NULL; /* prepare the dictionary holding the information */ if ((ls_list = PyList_New(0)) == NULL) goto exit_fail; - for (i = 0; i < hss_count; i++) { + for (int i = 0; i < hss_count; i++) { /* fill the dictionary information */ ls_entry = Py_BuildValue( @@ -981,7 +980,7 @@ released.\n"); static PyObject * py_get_lockspaces(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv, i, lss_count; + int rv, lss_count; struct sanlk_lockspace *lss = NULL; PyObject *ls_list = NULL, *ls_entry = NULL; @@ -999,7 +998,7 @@ py_get_lockspaces(PyObject *self __unused, PyObject *args, PyObject *keywds) if ((ls_list = PyList_New(0)) == NULL) goto exit_fail; - for (i = 0; i < lss_count; i++) { + for (int i = 0; i < lss_count; i++) { /* fill the dictionary information */ ls_entry = Py_BuildValue( @@ -1354,8 +1353,8 @@ finally: static int parse_killpath_item(PyObject *item, char *kpargs, size_t *kplen) { - int rv = 0, i; - size_t arg_len; + int rv = 0; + size_t arg_len = 0; PyObject *path = NULL; const char *p = NULL; @@ -1367,7 +1366,7 @@ parse_killpath_item(PyObject *item, char *kpargs, size_t *kplen) goto finally; } /* computing the argument length considering the escape chars */ - for (i = 0, arg_len = 0; p[i]; i++, arg_len++) { + for (int i = 0; p[i]; i++, arg_len++) { if (p[i] == ' ' || p[i] == '\\') arg_len++; } @@ -1407,8 +1406,8 @@ The arguments must be in the format: [\"arg1\", \"arg2\", ...]"); static PyObject * py_killpath(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, i, num_args, sanlockfd = -1; - size_t kplen; + int rv = -1, num_args, sanlockfd = -1; + size_t kplen = 0; char kpargs[SANLK_HELPER_ARGS_LEN]; PyObject *path = NULL; PyObject *argslist; @@ -1431,7 +1430,7 @@ py_killpath(PyObject *self __unused, PyObject *args, PyObject *keywds) memset(kpargs, 0, SANLK_HELPER_ARGS_LEN); /* creating the arguments string from a python list */ - for (i = 0, kplen = 0; i < num_args; i++) { + for (int i = 0; i < num_args; i++) { PyObject *item = PyList_GetItem(argslist, i); if (!parse_killpath_item(item, kpargs, &kplen)) { goto finally; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 08/14: python: Use C99 standard
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 8b918e08da50255cf1486f14a252f4cd46a1c143 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 21:48:01 2019 +0300 python: Use C99 standard Using C99 enables useful features[1] is old enough so it should not be a portability issue. [1] https://fedoramagazine.org/c99-features-gcc-fedora/ Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/setup.py b/python/setup.py index 369451c..0f3d683 100644 --- a/python/setup.py +++ b/python/setup.py @@ -11,6 +11,7 @@ sanlock = Extension(name='sanlock', sources=['sanlock.c'], include_dirs=['../src'], library_dirs=['../src'], + extra_compile_args=["-std=c99"], extra_link_args=['-fPIE', '-Wl,-z,relro,-z,now'], libraries=sanlocklib) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 07/14: python: Remove meaningless "All rights reserved"
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 268116d12fcb89d93e076138d2971655849eae44 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 20:57:55 2019 +0300 python: Remove meaningless "All rights reserved" The python extension source does not use this pointless text. Unify the module docstring to use the same license blob of its source. For more info why "All rights reserved" is meaningless, see: https://github.com/libguestfs/nbdkit/commit/952ffe0fc7685ea775ed8879bf0b2cb… Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/sanlock.c b/python/sanlock.c index 83ecf8a..2216322 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -27,7 +27,7 @@ static void set_error(PyObject *exception, const char* format, PyObject* obj); /* Sanlock module */ PyDoc_STRVAR(pydoc_sanlock, "\ -Copyright (C) 2010-2019 Red Hat, Inc. All rights reserved.\n\ +Copyright (C) 2010-2019 Red Hat, Inc.\n\ This copyrighted material is made available to anyone wishing to use,\n\ modify, copy, or redistribute it subject to the terms and conditions\n\ of the GNU General Public License v2 or (at your option) any later version."); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 06/14: python: Add missing license blob to python files
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit d4964826f5dcd2dc8aa4527acb516acdf24a512b Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 20:51:53 2019 +0300 python: Add missing license blob to python files Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/example.py | 7 +++++++ tests/conftest.py | 6 ++++++ tests/constants.py | 6 ++++++ tests/daemon_test.py | 6 ++++++ tests/direct_test.py | 6 ++++++ tests/python_test.py | 6 ++++++ tests/storage.py | 6 ++++++ tests/units.py | 6 ++++++ tests/util.py | 6 ++++++ 9 files changed, 55 insertions(+) diff --git a/python/example.py b/python/example.py index 35d39f5..bec9309 100644 --- a/python/example.py +++ b/python/example.py @@ -1,3 +1,10 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + from __future__ import print_function import pwd diff --git a/tests/conftest.py b/tests/conftest.py index 868ae46..b40852b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ Fixtures for sanlock testing. """ diff --git a/tests/constants.py b/tests/constants.py index 21089b8..3d9c332 100644 --- a/tests/constants.py +++ b/tests/constants.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ Constants copied from sanlock source. """ diff --git a/tests/daemon_test.py b/tests/daemon_test.py index 413ce95..1b484f2 100644 --- a/tests/daemon_test.py +++ b/tests/daemon_test.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ Test sanlock client operations. """ diff --git a/tests/direct_test.py b/tests/direct_test.py index 339ef51..579f228 100644 --- a/tests/direct_test.py +++ b/tests/direct_test.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ Test sanlock direct options. """ diff --git a/tests/python_test.py b/tests/python_test.py index 331e901..0f70a6a 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ Test sanlock python binding with sanlock daemon. """ diff --git a/tests/storage.py b/tests/storage.py index b7fcb2a..0fe6f56 100644 --- a/tests/storage.py +++ b/tests/storage.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ storage - provide storage for sanlock tests. """ diff --git a/tests/units.py b/tests/units.py index b47d668..166bff5 100644 --- a/tests/units.py +++ b/tests/units.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ Constants for file/disk sizes. """ diff --git a/tests/util.py b/tests/util.py index 6a648c4..12f2702 100644 --- a/tests/util.py +++ b/tests/util.py @@ -1,3 +1,9 @@ +# Copyright (C) 2019 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. """ Testing utilities """ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 05/14: python: Fix copyright years
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 4727ba0f868a4b7532a3c74cbe839e20054fb7d3 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 20:43:36 2019 +0300 python: Fix copyright years Fix the years range in the python extension and python files license blob. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 4 ++-- python/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index c44fee7..83ecf8a 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 Red Hat, Inc. + * Copyright 2010-2019 Red Hat, Inc. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions @@ -27,7 +27,7 @@ static void set_error(PyObject *exception, const char* format, PyObject* obj); /* Sanlock module */ PyDoc_STRVAR(pydoc_sanlock, "\ -Copyright (C) 2010-2011 Red Hat, Inc. All rights reserved.\n\ +Copyright (C) 2010-2019 Red Hat, Inc. All rights reserved.\n\ This copyrighted material is made available to anyone wishing to use,\n\ modify, copy, or redistribute it subject to the terms and conditions\n\ of the GNU General Public License v2 or (at your option) any later version."); diff --git a/python/setup.py b/python/setup.py index 91311a8..369451c 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Red Hat, Inc. +# Copyright 2010-2019 Red Hat, Inc. # # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 04/14: python: Rename __hosts_to_list to hosts_to_list
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit de6df0eda3644a9f5da50c9b025c469269d2fe1b Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 21:27:46 2019 +0300 python: Rename __hosts_to_list to hosts_to_list Underscore prefix is reserved for the compiler and standard library so we should not use it for our helpers. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 4155b51..c44fee7 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -269,7 +269,7 @@ set_error(PyObject* exception, const char* format, PyObject* obj) } static PyObject * -__hosts_to_list(struct sanlk_host *hss, int hss_count) +hosts_to_list(struct sanlk_host *hss, int hss_count) { int i; PyObject *ls_list = NULL, *ls_entry = NULL; @@ -1073,7 +1073,7 @@ py_get_hosts(PyObject *self __unused, PyObject *args, PyObject *keywds) goto finally; } - ls_list = __hosts_to_list(hss, hss_count); + ls_list = hosts_to_list(hss, hss_count); finally: Py_XDECREF(lockspace); @@ -1339,7 +1339,7 @@ py_read_resource_owners(PyObject *self __unused, PyObject *args, PyObject *keywd goto finally; } - ls_list = __hosts_to_list(hss, hss_count); + ls_list = hosts_to_list(hss, hss_count); finally: Py_XDECREF(lockspace); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 03/14: python: Rename __parse_resource to parse_disks
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 3dcbf2a616f43c8a93391049b3be4a13130a0dcd Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 20:38:48 2019 +0300 python: Rename __parse_resource to parse_disks Underscore prefix is reserved for the compiler and standard library so we should not use it for our helpers. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 42b46fb..4155b51 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -22,7 +22,7 @@ /* Functions prototypes */ static void set_sanlock_error(int en, char *msg); -static int __parse_resource(PyObject *obj, struct sanlk_resource **res_ret); +static int parse_disks(PyObject *obj, struct sanlk_resource **res_ret); static void set_error(PyObject *exception, const char* format, PyObject* obj); /* Sanlock module */ @@ -173,7 +173,7 @@ finally: } static int -__parse_resource(PyObject *obj, struct sanlk_resource **res_ret) +parse_disks(PyObject *obj, struct sanlk_resource **res_ret) { int i, num_disks, res_len; struct sanlk_resource *res; @@ -481,7 +481,7 @@ py_init_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) } /* parse and check sanlock resource */ - if (__parse_resource(disks, &res) < 0) { + if (parse_disks(disks, &res) < 0) { goto finally; } @@ -747,7 +747,7 @@ py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) } /* parse and check sanlock resource */ - if (__parse_resource(disks, &rs) < 0) { + if (parse_disks(disks, &rs) < 0) { goto finally; } @@ -1118,7 +1118,7 @@ py_acquire(PyObject *self __unused, PyObject *args, PyObject *keywds) } /* parse and check sanlock resource */ - if (__parse_resource(disks, &res) < 0) { + if (parse_disks(disks, &res) < 0) { goto finally; } @@ -1185,7 +1185,7 @@ py_release(PyObject *self __unused, PyObject *args, PyObject *keywds) } /* parse and check sanlock resource */ - if (__parse_resource(disks, &res) < 0) { + if (parse_disks(disks, &res) < 0) { goto finally; } @@ -1241,7 +1241,7 @@ py_request(PyObject *self __unused, PyObject *args, PyObject *keywds) } /* parse and check sanlock resource */ - if (__parse_resource(disks, &res) < 0) { + if (parse_disks(disks, &res) < 0) { goto finally; } @@ -1313,7 +1313,7 @@ py_read_resource_owners(PyObject *self __unused, PyObject *args, PyObject *keywd } /* parse and check sanlock resource */ - if (__parse_resource(disks, &res) < 0) { + if (parse_disks(disks, &res) < 0) { goto finally; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/14: python: Rename __set_exception to set_sanlock_error
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit e40db2ecd00c3376fe1b1dc7f5ed4c021031a9ff Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 20:30:52 2019 +0300 python: Rename __set_exception to set_sanlock_error Underscore prefix is reserved for the compiler and standard library so we should not use it for our helpers. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 58 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 7574141..42b46fb 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -21,7 +21,7 @@ #define BIND_ERROR -1000 /* Functions prototypes */ -static void __set_exception(int en, char *msg); +static void set_sanlock_error(int en, char *msg); static int __parse_resource(PyObject *obj, struct sanlk_resource **res_ret); static void set_error(PyObject *exception, const char* format, PyObject* obj); @@ -36,7 +36,7 @@ of the GNU General Public License v2 or (at your option) any later version."); static PyObject *py_exception; static void -__set_exception(int en, char *msg) +set_sanlock_error(int en, char *msg) { const char *err_name; PyObject *exc_tuple; @@ -323,7 +323,7 @@ py_register(PyObject *self __unused, PyObject *args) Py_END_ALLOW_THREADS if (sanlockfd < 0) { - __set_exception(sanlockfd, "Sanlock registration failed"); + set_sanlock_error(sanlockfd, "Sanlock registration failed"); return NULL; } @@ -356,7 +356,7 @@ py_get_alignment(PyObject *self __unused, PyObject *args) Py_END_ALLOW_THREADS if (rv < 0) { - __set_exception(rv, "Unable to get device alignment"); + set_sanlock_error(rv, "Unable to get device alignment"); goto finally; } @@ -442,7 +442,7 @@ py_init_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock lockspace init failure"); + set_sanlock_error(rv, "Sanlock lockspace init failure"); goto finally; } @@ -495,7 +495,7 @@ py_init_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock resource init failure"); + set_sanlock_error(rv, "Sanlock resource init failure"); goto finally; } @@ -556,7 +556,7 @@ py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock lockspace write failure"); + set_sanlock_error(rv, "Sanlock lockspace write failure"); goto finally; } @@ -612,7 +612,7 @@ py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock lockspace read failure"); + set_sanlock_error(rv, "Sanlock lockspace read failure"); goto finally; } @@ -688,7 +688,7 @@ py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock resource read failure"); + set_sanlock_error(rv, "Sanlock resource read failure"); goto finally; } @@ -772,7 +772,7 @@ py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock resource write failure"); + set_sanlock_error(rv, "Sanlock resource write failure"); goto finally; } @@ -831,7 +831,7 @@ py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock lockspace add failure"); + set_sanlock_error(rv, "Sanlock lockspace add failure"); goto finally; } @@ -901,7 +901,7 @@ finally: Py_RETURN_NONE; } - __set_exception(rv, "Sanlock lockspace inquire failure"); + set_sanlock_error(rv, "Sanlock lockspace inquire failure"); return NULL; } @@ -957,7 +957,7 @@ py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock lockspace remove failure"); + set_sanlock_error(rv, "Sanlock lockspace remove failure"); goto finally; } @@ -991,7 +991,7 @@ py_get_lockspaces(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv < 0) { - __set_exception(rv, "Sanlock get lockspaces failure"); + set_sanlock_error(rv, "Sanlock get lockspaces failure"); goto exit_fail; } @@ -1069,7 +1069,7 @@ py_get_hosts(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv < 0) { - __set_exception(rv, "Sanlock get hosts failure"); + set_sanlock_error(rv, "Sanlock get hosts failure"); goto finally; } @@ -1113,7 +1113,7 @@ py_acquire(PyObject *self __unused, PyObject *args, PyObject *keywds) /* check if any of the slkfd or pid parameters was given */ if (sanlockfd == -1 && pid == -1) { - __set_exception(EINVAL, "Invalid slkfd and pid values"); + set_sanlock_error(EINVAL, "Invalid slkfd and pid values"); goto finally; } @@ -1136,7 +1136,7 @@ py_acquire(PyObject *self __unused, PyObject *args, PyObject *keywds) res->flags |= SANLK_RES_LVER; res->lver = pyinteger_as_unsigned_long_long_mask(version); if (res->lver == (uint64_t)-1) { - __set_exception(EINVAL, "Unable to convert the version value"); + set_sanlock_error(EINVAL, "Unable to convert the version value"); goto finally; } } @@ -1147,7 +1147,7 @@ py_acquire(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock resource not acquired"); + set_sanlock_error(rv, "Sanlock resource not acquired"); goto finally; } @@ -1199,7 +1199,7 @@ py_release(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock resource not released"); + set_sanlock_error(rv, "Sanlock resource not released"); goto finally; } @@ -1256,7 +1256,7 @@ py_request(PyObject *self __unused, PyObject *args, PyObject *keywds) res->flags |= SANLK_RES_LVER; res->lver = pyinteger_as_unsigned_long_long_mask(version); if (res->lver == (uint64_t)-1) { - __set_exception(EINVAL, "Unable to convert the version value"); + set_sanlock_error(EINVAL, "Unable to convert the version value"); goto finally; } } @@ -1267,7 +1267,7 @@ py_request(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Sanlock request not submitted"); + set_sanlock_error(rv, "Sanlock request not submitted"); goto finally; } @@ -1335,7 +1335,7 @@ py_read_resource_owners(PyObject *self __unused, PyObject *args, PyObject *keywd Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Unable to read resource owners"); + set_sanlock_error(rv, "Unable to read resource owners"); goto finally; } @@ -1373,7 +1373,7 @@ parse_killpath_item(PyObject *item, char *kpargs, size_t *kplen) /* adding 2 for the space separator ' ' and the '\0' terminator */ if (*kplen + arg_len + 2 > SANLK_HELPER_ARGS_LEN) { - __set_exception(EINVAL, "Killpath arguments are too long"); + set_sanlock_error(EINVAL, "Killpath arguments are too long"); goto finally; } @@ -1423,7 +1423,7 @@ py_killpath(PyObject *self __unused, PyObject *args, PyObject *keywds) /* checking the path length */ if (PyBytes_Size(path) + 1 > SANLK_HELPER_PATH_LEN) { - __set_exception(EINVAL, "Killpath path argument too long"); + set_sanlock_error(EINVAL, "Killpath path argument too long"); goto finally; } @@ -1444,7 +1444,7 @@ py_killpath(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Killpath script not configured"); + set_sanlock_error(rv, "Killpath script not configured"); goto finally; } @@ -1495,7 +1495,7 @@ py_reg_event(PyObject *self __unused, PyObject *args) Py_END_ALLOW_THREADS if (fd < 0) { - __set_exception(fd, "Unable to register event fd"); + set_sanlock_error(fd, "Unable to register event fd"); goto finally; } @@ -1547,7 +1547,7 @@ py_get_event(PyObject *self __unused, PyObject *args) break; if (rv != 0) { - __set_exception(rv, "Unable to get events"); + set_sanlock_error(rv, "Unable to get events"); goto exit_fail; } @@ -1638,7 +1638,7 @@ py_end_event(PyObject *self __unused, PyObject *args) Py_END_ALLOW_THREADS if (rv < 0) { - __set_exception(rv, "Unable to unregister event fd"); + set_sanlock_error(rv, "Unable to unregister event fd"); goto finally; } @@ -1723,7 +1723,7 @@ py_set_event(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_END_ALLOW_THREADS if (rv < 0) { - __set_exception(rv, "Unable to set event"); + set_sanlock_error(rv, "Unable to set event"); goto finally; } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/14: python: Remove CPyChecker support
by pagure＠pagure.io 25 Jun '19

25 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. commit 1ff38e0e2cd7f4234c20e33ffeec3815da0df438 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Fri Jun 14 20:24:14 2019 +0300 python: Remove CPyChecker support We don't use use this tool, lets remove old craft. If someone wants to add this back it must have proper documentation and integrated in the build system. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 7f0916a..7574141 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -16,27 +16,13 @@ #define __unused __attribute__ ((unused)) #endif -#ifdef WITH_CPYCHECKER_SETS_EXCEPTION_ATTRIBUTE -#define __sets_exception \ - __attribute__((cpychecker_sets_exception)) -#else -#define __sets_exception -#endif - -#ifdef WITH_CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION_ATTRIBUTE -#define __neg_sets_exception \ - __attribute__((cpychecker_negative_result_sets_exception)) -#else -#define __neg_sets_exception -#endif - #define MODULE_NAME "sanlock" #define BIND_ERROR -1000 /* Functions prototypes */ -static void __set_exception(int en, char *msg) __sets_exception; -static int __parse_resource(PyObject *obj, struct sanlk_resource **res_ret) __neg_sets_exception; +static void __set_exception(int en, char *msg); +static int __parse_resource(PyObject *obj, struct sanlk_resource **res_ret); static void set_error(PyObject *exception, const char* format, PyObject* obj); /* Sanlock module */ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH 00/14] Python extension cleanups
by Nir Soffer 25 Jun '19

25 Jun '19

Lately I spent lot of time reviewing changes to the this messy code, and it is time to clean up the mess. I'm planning many more cleanups, but this is enough for today. Nir Soffer (14): python: Remove CPyChecker support python: Rename __set_exception to set_sanlock_error python: Rename __parse_resource to parse_disks python: Rename __hosts_to_list to hosts_to_list python: Fix copyright years python: Add missing license blob to python files python: Remove meaningless "All rights reserved" python: Use C99 standard python: Limit the scope of for loop counter python: Remove unneeded check for null python: Streamline hosts_to_list python: Streamline py_get_lockspaces() python: Unify indentation python: Unify resource variables names python/example.py | 7 + python/sanlock.c | 310 ++++++++++++++++++++----------------------- python/setup.py | 3 +- tests/conftest.py | 6 + tests/constants.py | 6 + tests/daemon_test.py | 6 + tests/direct_test.py | 6 + tests/python_test.py | 6 + tests/storage.py | 6 + tests/units.py | 6 + tests/util.py | 6 + 11 files changed, 204 insertions(+), 164 deletions(-) -- 2.17.2

4 19

[PATCH v2 0/8] Python extension cleanups (continued)
by Nir Soffer 20 Jun '19

20 Jun '19

More cleanups patches based on my last cleanups series. The path legnth validation fix is a very old issue, but it can be nice to deliver in 3.8.1. More fixes are needed for truncating silently lockspace path, lockspace name and resource name. These are only the new patches since v1. I will combine all pathes in v3. v1 was here: https://lists.fedorahosted.org/archives/list/sanlock-devel@lists.fedorahost… The changes are also availale in: https://github.com/nirs/sanlock/tree/cleanups-v2 Based on commit 50a6590db428769e653282f11eb3051c31938a92 (python: Unify resource variables names). Nir Soffer (8): python: Use Py_BuildValue to create event dicts python: Use Py_CLEAR python: Streamline initexception python: Extract create_resource() helper python: Replace memset() with initializer python: Add missing arg parsing tests python: Add failing tests for long disk path python: Fail with ValueError if disk path is too long python/sanlock.c | 191 ++++++++++++++++--------------------------- tests/constants.py | 4 + tests/python_test.py | 98 ++++++++++++++++++++++ 3 files changed, 172 insertions(+), 121 deletions(-) -- 2.17.2

2 12

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

sanlock-devel June 2019