June 2019 - sanlock-devel - Fedora mailing-lists

[PATCH] spec: Convert development spec to python 3
by Nir Soffer 12 Jun '19

12 Jun '19

The development spec creates now only python 3 packages. This will be the base for Fedora 30 and CentOS 8.1 spec. Also make rpmlint happy about mixing tabs and spaces by using only spaces. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- sanlock.spec.in | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/sanlock.spec.in b/sanlock.spec.in index 9ad2985..087076c 100644 --- a/sanlock.spec.in +++ b/sanlock.spec.in @@ -16,30 +16,23 @@ URL: https://pagure.io/sanlock/ BuildRequires: gcc BuildRequires: libaio-devel BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: make -BuildRequires: python2 -BuildRequires: python2-devel +BuildRequires: python3 +BuildRequires: python3-devel BuildRequires: systemd-units Requires: %{name}-lib = %{version}-%{release} Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires(post): systemd-units Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz -# On Fedora we switched sanlock-python to python2-sanlock, as part of python 3 -# porting. This change was not done yet for RHEL. -# TODO: remove when RHEL switches to pythonN-sanlock. -%if 0%{?fedora} -%global python_package python2-%{name} -%else # centos/rhel -%global python_package %{name}-python -%endif +%global python_package python3-%{name} %description The sanlock daemon manages leases for applications on hosts using shared storage. %prep @@ -51,11 +44,11 @@ The sanlock daemon manages leases for applications on hosts using shared storage %endif # upstream does not require configure # upstream does not support _smp_mflags CFLAGS=$RPM_OPT_FLAGS make -C wdmd CFLAGS=$RPM_OPT_FLAGS make -C src -CFLAGS=$RPM_OPT_FLAGS make -C python +CFLAGS=$RPM_OPT_FLAGS make -C python PY_VERSION=3.6 CFLAGS=$RPM_OPT_FLAGS make -C reset %install rm -rf $RPM_BUILD_ROOT make -C src \ @@ -65,11 +58,11 @@ make -C wdmd \ install LIBDIR=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT make -C python \ install LIBDIR=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT \ - PY_VERSION=2.7 # TODO: fix PY_VERSION to 3.6 when 2020 will arrive + PY_VERSION=3.6 make -C reset \ install LIBDIR=%{_libdir} \ DESTDIR=$RPM_BUILD_ROOT @@ -77,28 +70,28 @@ install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT/%{_unitdir}/san install -D -m 0755 init.d/wdmd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-wdmd install -D -m 0644 init.d/wdmd.service.native $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service install -D -m 0644 init.d/sanlk-resetd.service $RPM_BUILD_ROOT/%{_unitdir}/sanlk-resetd.service install -D -m 0644 src/logrotate.sanlock \ - $RPM_BUILD_ROOT/etc/logrotate.d/sanlock + $RPM_BUILD_ROOT/etc/logrotate.d/sanlock install -D -m 0644 src/sanlock.conf \ - $RPM_BUILD_ROOT/etc/sanlock/sanlock.conf + $RPM_BUILD_ROOT/etc/sanlock/sanlock.conf install -D -m 0644 init.d/wdmd.sysconfig \ - $RPM_BUILD_ROOT/etc/sysconfig/wdmd + $RPM_BUILD_ROOT/etc/sysconfig/wdmd install -Dd -m 0755 $RPM_BUILD_ROOT/etc/wdmd.d install -Dd -m 0775 $RPM_BUILD_ROOT/%{_rundir}/sanlock install -Dd -m 0775 $RPM_BUILD_ROOT/%{_rundir}/sanlk-resetd %pre getent group sanlock > /dev/null || /usr/sbin/groupadd \ - -g 179 sanlock + -g 179 sanlock getent passwd sanlock > /dev/null || /usr/sbin/useradd \ - -u 179 -c "sanlock" -s /sbin/nologin -r \ - -g 179 -d /run/sanlock sanlock + -u 179 -c "sanlock" -s /sbin/nologin -r \ + -g 179 -d /run/sanlock sanlock /usr/sbin/usermod -a -G disk sanlock %post %systemd_post wdmd.service sanlock.service @@ -144,25 +137,21 @@ access to the shared disks. %package -n %{python_package} Summary: Python bindings for the sanlock library Requires: %{name}-lib = %{version}-%{release} %if 0%{?fedora} -%{?python_provide:%python_provide python2-%{name}} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} +%{?python_provide:%python_provide %{python_package}} %endif # fedora %description -n %{python_package} The %{python_package} package contains a module that permits applications written in the Python programming language to use the interface supplied by the sanlock library. %files -n %{python_package} -%{python2_sitearch}/sanlock_python-*.egg-info -%{python2_sitearch}/sanlock.so +%{python3_sitearch}/sanlock_python-*.egg-info +%{python3_sitearch}/sanlock*.so %package devel Summary: Development files for %{name} Requires: %{name}-lib = %{version}-%{release} @@ -201,8 +190,11 @@ common sanlock lockspace. %dir %attr(-,root,root) %{_rundir}/sanlk-resetd %{_mandir}/man8/sanlk-reset* %changelog +* Wed Jun 12 2019 Nir Soffer <nsoffer(a)redhat.com> - 3.8.0-1 +- Convert spec to python 3 + * Mon Mar 25 2019 Nir Soffer <nsoffer(a)redhat.com> - 3.7.0-1 - Import spec from Fedora master branch (371e11a) - Fix spec to work on CentOS (20efe91) -- 2.17.2

1 0

[sanlock] branch master updated: python: Replace async with wait
by pagure＠pagure.io 12 Jun '19

12 Jun '19

This is an automated email from the git hooks/post-receive script. nsoffer pushed a commit to branch master in repository sanlock. The following commit(s) were added to refs/heads/master by this push: new d8020e3 python: Replace async with wait d8020e3 is described below commit d8020e3e65b4340ac7e312ceae4bd6aca9069bae Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Tue Jun 11 20:18:04 2019 +0300 python: Replace async with wait The async argument to add_lockspace() and rem_lockspace() is not valid syntax in python 3.7, since async is a keyword now. Replace async=False with wait=True, already used in other sanlock methods. This change breaks compatibility with existing python 2 code, but we plan to ship sanlock 3.8 with python 3 support only on Fedora 30 and EL 8.1 which do not support python 2, so this does not break existing users. Python code that wants to support both sanlock 3.7 and 3.8 will have to change the behaviour based on python version. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 26 ++++++++++++++------------ tests/python_test.py | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index d122c8e..7f0916a 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -801,8 +801,8 @@ finally: /* add_lockspace */ PyDoc_STRVAR(pydoc_add_lockspace, "\ -add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, async=False)\n\ -Add a lockspace, acquiring a host_id in it. If async is True the function\n\ +add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, wait=True)\n\ +Add a lockspace, acquiring a host_id in it. If wait is False the function\n\ will return immediatly and the status can be checked using inq_lockspace.\n\ The iotimeout option configures the io timeout for the specific lockspace,\n\ overriding the default value (see the sanlock daemon parameter -o)."); @@ -810,14 +810,15 @@ overriding the default value (see the sanlock daemon parameter -o)."); static PyObject * py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, async = 0, flags = 0; + int rv = -1, flags = 0; + int wait = 1; uint32_t iotimeout = 0; PyObject *lockspace = NULL; PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", - "iotimeout", "async", NULL}; + "iotimeout", "wait", NULL}; /* initialize lockspace structure */ memset(&ls, 0, sizeof(struct sanlk_lockspace)); @@ -825,12 +826,12 @@ py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) /* parse python tuple */ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|kIi", kwlist, convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, - &ls.host_id_disk.offset, &iotimeout, &async)) { + &ls.host_id_disk.offset, &iotimeout, &wait)) { goto finally; } /* prepare sanlock_add_lockspace flags */ - if (async) { + if (!wait) { flags |= SANLK_ADD_ASYNC; } @@ -920,8 +921,8 @@ finally: /* rem_lockspace */ PyDoc_STRVAR(pydoc_rem_lockspace, "\ -rem_lockspace(lockspace, host_id, path, offset=0, async=False, unused=False)\n\ -Remove a lockspace, releasing the acquired host_id. If async is True the\n\ +rem_lockspace(lockspace, host_id, path, offset=0, wait=True, unused=False)\n\ +Remove a lockspace, releasing the acquired host_id. If wait is False the\n\ function will return immediately and the status can be checked using\n\ inq_lockspace. If unused is True the command will fail (EBUSY) if there is\n\ at least one acquired resource in the lockspace. Otherwise (the default)\n\ @@ -931,13 +932,14 @@ successful termination these leases will be released."); static PyObject * py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, async = 0, unused = 0, flags = 0; + int rv = -1, unused = 0, flags = 0; + int wait = 1; PyObject *lockspace = NULL; PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", - "async", "unused", NULL}; + "wait", "unused", NULL}; /* initialize lockspace structure */ memset(&ls, 0, sizeof(struct sanlk_lockspace)); @@ -946,7 +948,7 @@ py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|kii", kwlist, convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, &ls.host_id_disk.offset, - &async, &unused)) { + &wait, &unused)) { goto finally; } @@ -955,7 +957,7 @@ py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* prepare sanlock_rem_lockspace flags */ - if (async) { + if (!wait) { flags |= SANLK_REM_ASYNC; } diff --git a/tests/python_test.py b/tests/python_test.py index a2e25fb..3242f57 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -341,7 +341,7 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): assert acquired is False # This will take 3 seconds. - sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, **{"async": True}) + sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, wait=False) # While the lockspace is being aquired, we expect to get None. time.sleep(1) @@ -353,7 +353,7 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): assert acquired is True # This will take about 3 seconds. - sanlock.rem_lockspace(b"ls_name", 1, path, **{"async": True}) + sanlock.rem_lockspace(b"ls_name", 1, path, wait=False) # Wait until the lockspace change state from True to None. while sanlock.inq_lockspace(b"ls_name", 1, path, wait=False): @@ -514,7 +514,7 @@ def raises_sanlock_errno(expected_errno=errno.ECONNREFUSED): def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.rem_lockspace(name, 1, path, 0) + sanlock.rem_lockspace(name, 1, path, 0, wait=False) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @@ -522,7 +522,7 @@ def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.add_lockspace(name, 1, path, 0) + sanlock.add_lockspace(name, 1, path, 0, wait=False) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

Re: [PATCH v2] python: Replace async with wait
by Amit Bawer 12 Jun '19

12 Jun '19

Even if its accidental, those tests are stubs, so it has no effect other than checking that argument parsing works as expected. On Wed, Jun 12, 2019 at 11:11 AM Pavel Bar <pbar(a)redhat.com> wrote: > > > On Wed, Jun 12, 2019 at 1:13 AM Nir Soffer <nirsof(a)gmail.com> wrote: > >> The async argument to add_lockspace() and rem_lockspace() is not valid >> syntax in python 3.7, since async is a keyword now. >> >> Replace async=False with wait=True, already used in other sanlock >> methods. >> >> This change breaks compatibility with existing python 2 code, but we >> plan to ship sanlock 3.8 with python 3 support only on Fedora 30 and >> EL 8.1 which do not support python 2, so this does not break existing >> users. >> >> Python code that wants to support both sanlock 3.7 and 3.8 will have to >> change the behaviour based on python version. >> >> Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> >> --- >> >> python/sanlock.c | 26 ++++++++++++++------------ >> tests/python_test.py | 8 ++++---- >> 2 files changed, 18 insertions(+), 16 deletions(-) >> >> diff --git a/python/sanlock.c b/python/sanlock.c >> index d122c8e..7f0916a 100644 >> --- a/python/sanlock.c >> +++ b/python/sanlock.c >> @@ -799,40 +799,41 @@ finally: >> Py_RETURN_NONE; >> } >> >> /* add_lockspace */ >> PyDoc_STRVAR(pydoc_add_lockspace, "\ >> -add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, >> async=False)\n\ >> -Add a lockspace, acquiring a host_id in it. If async is True the >> function\n\ >> +add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, >> wait=True)\n\ >> +Add a lockspace, acquiring a host_id in it. If wait is False the >> function\n\ >> will return immediatly and the status can be checked using >> inq_lockspace.\n\ >> The iotimeout option configures the io timeout for the specific >> lockspace,\n\ >> overriding the default value (see the sanlock daemon parameter -o)."); >> >> static PyObject * >> py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject >> *keywds) >> { >> - int rv = -1, async = 0, flags = 0; >> + int rv = -1, flags = 0; >> + int wait = 1; >> uint32_t iotimeout = 0; >> PyObject *lockspace = NULL; >> PyObject *path = NULL; >> struct sanlk_lockspace ls; >> >> static char *kwlist[] = {"lockspace", "host_id", "path", "offset", >> - "iotimeout", "async", NULL}; >> + "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, >> - &ls.host_id_disk.offset, &iotimeout, &async)) { >> + &ls.host_id_disk.offset, &iotimeout, &wait)) { >> goto finally; >> } >> >> /* prepare sanlock_add_lockspace flags */ >> - if (async) { >> + if (!wait) { >> flags |= SANLK_ADD_ASYNC; >> } >> >> /* prepare sanlock names */ >> strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); >> @@ -918,46 +919,47 @@ finally: >> return NULL; >> } >> >> /* rem_lockspace */ >> PyDoc_STRVAR(pydoc_rem_lockspace, "\ >> -rem_lockspace(lockspace, host_id, path, offset=0, async=False, >> unused=False)\n\ >> -Remove a lockspace, releasing the acquired host_id. If async is True >> the\n\ >> +rem_lockspace(lockspace, host_id, path, offset=0, wait=True, >> unused=False)\n\ >> +Remove a lockspace, releasing the acquired host_id. If wait is False >> the\n\ >> function will return immediately and the status can be checked using\n\ >> inq_lockspace. If unused is True the command will fail (EBUSY) if there >> is\n\ >> at least one acquired resource in the lockspace. Otherwise (the >> default)\n\ >> sanlock will try to terminate processes holding resource leases and >> upon\n\ >> successful termination these leases will be released."); >> >> static PyObject * >> py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject >> *keywds) >> { >> - int rv = -1, async = 0, unused = 0, flags = 0; >> + int rv = -1, unused = 0, flags = 0; >> + int wait = 1; >> PyObject *lockspace = NULL; >> PyObject *path = NULL; >> struct sanlk_lockspace ls; >> >> static char *kwlist[] = {"lockspace", "host_id", "path", "offset", >> - "async", "unused", NULL}; >> + "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, >> &ls.host_id_disk.offset, >> - &async, &unused)) { >> + &wait, &unused)) { >> goto finally; >> } >> >> /* prepare sanlock names */ >> strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); >> strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN >> - 1); >> >> /* prepare sanlock_rem_lockspace flags */ >> - if (async) { >> + if (!wait) { >> flags |= SANLK_REM_ASYNC; >> } >> >> if (unused) { >> flags |= SANLK_REM_UNUSED; >> diff --git a/tests/python_test.py b/tests/python_test.py >> index a2e25fb..3242f57 100644 >> --- a/tests/python_test.py >> +++ b/tests/python_test.py >> @@ -339,11 +339,11 @@ def test_add_rem_lockspace_async(tmpdir, >> sanlock_daemon): >> sanlock.write_lockspace(b"ls_name", path, iotimeout=1) >> acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=False) >> assert acquired is False >> >> # This will take 3 seconds. >> - sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, **{"async": >> True}) >> + sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, wait=False) >> >> # While the lockspace is being aquired, we expect to get None. >> time.sleep(1) >> acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=False) >> assert acquired is None >> @@ -351,11 +351,11 @@ def test_add_rem_lockspace_async(tmpdir, >> sanlock_daemon): >> # Once the lockspace is acquired, we exepect to get True. >> acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=True) >> assert acquired is True >> >> # This will take about 3 seconds. >> - sanlock.rem_lockspace(b"ls_name", 1, path, **{"async": True}) >> + sanlock.rem_lockspace(b"ls_name", 1, path, wait=False) >> >> # Wait until the lockspace change state from True to None. >> while sanlock.inq_lockspace(b"ls_name", 1, path, wait=False): >> time.sleep(1) >> >> @@ -512,19 +512,19 @@ def >> raises_sanlock_errno(expected_errno=errno.ECONNREFUSED): >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, >> encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> with raises_sanlock_errno(): >> - sanlock.rem_lockspace(name, 1, path, 0) >> + sanlock.rem_lockspace(name, 1, path, 0, wait=False) >> > > Just wanted to be sure that this is intentional: > Previously "async" was not passed and it's default value was "async=False" > that now has changed to "wait=True". But now you explicitly pass > "wait=False". > Is it on purpose? > The same question about the below "test_add_lockspace_parse_args()". > >> >> >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, >> encoding): >> path = util.generate_path("/tmp/", filename, encoding) >> with raises_sanlock_errno(): >> - sanlock.add_lockspace(name, 1, path, 0) >> + sanlock.add_lockspace(name, 1, path, 0, wait=False) >> >> >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, >> encoding): >> -- >> 2.17.2 >> >>

2 1

[PATCH v2] python: Replace async with wait
by Nir Soffer 12 Jun '19

12 Jun '19

The async argument to add_lockspace() and rem_lockspace() is not valid syntax in python 3.7, since async is a keyword now. Replace async=False with wait=True, already used in other sanlock methods. This change breaks compatibility with existing python 2 code, but we plan to ship sanlock 3.8 with python 3 support only on Fedora 30 and EL 8.1 which do not support python 2, so this does not break existing users. Python code that wants to support both sanlock 3.7 and 3.8 will have to change the behaviour based on python version. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 26 ++++++++++++++------------ tests/python_test.py | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index d122c8e..7f0916a 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -799,40 +799,41 @@ finally: Py_RETURN_NONE; } /* add_lockspace */ PyDoc_STRVAR(pydoc_add_lockspace, "\ -add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, async=False)\n\ -Add a lockspace, acquiring a host_id in it. If async is True the function\n\ +add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, wait=True)\n\ +Add a lockspace, acquiring a host_id in it. If wait is False the function\n\ will return immediatly and the status can be checked using inq_lockspace.\n\ The iotimeout option configures the io timeout for the specific lockspace,\n\ overriding the default value (see the sanlock daemon parameter -o)."); static PyObject * py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, async = 0, flags = 0; + int rv = -1, flags = 0; + int wait = 1; uint32_t iotimeout = 0; PyObject *lockspace = NULL; PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", - "iotimeout", "async", NULL}; + "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, - &ls.host_id_disk.offset, &iotimeout, &async)) { + &ls.host_id_disk.offset, &iotimeout, &wait)) { goto finally; } /* prepare sanlock_add_lockspace flags */ - if (async) { + if (!wait) { flags |= SANLK_ADD_ASYNC; } /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); @@ -918,46 +919,47 @@ finally: return NULL; } /* rem_lockspace */ PyDoc_STRVAR(pydoc_rem_lockspace, "\ -rem_lockspace(lockspace, host_id, path, offset=0, async=False, unused=False)\n\ -Remove a lockspace, releasing the acquired host_id. If async is True the\n\ +rem_lockspace(lockspace, host_id, path, offset=0, wait=True, unused=False)\n\ +Remove a lockspace, releasing the acquired host_id. If wait is False the\n\ function will return immediately and the status can be checked using\n\ inq_lockspace. If unused is True the command will fail (EBUSY) if there is\n\ at least one acquired resource in the lockspace. Otherwise (the default)\n\ sanlock will try to terminate processes holding resource leases and upon\n\ successful termination these leases will be released."); static PyObject * py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, async = 0, unused = 0, flags = 0; + int rv = -1, unused = 0, flags = 0; + int wait = 1; PyObject *lockspace = NULL; PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", - "async", "unused", NULL}; + "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, &ls.host_id_disk.offset, - &async, &unused)) { + &wait, &unused)) { goto finally; } /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* prepare sanlock_rem_lockspace flags */ - if (async) { + if (!wait) { flags |= SANLK_REM_ASYNC; } if (unused) { flags |= SANLK_REM_UNUSED; diff --git a/tests/python_test.py b/tests/python_test.py index a2e25fb..3242f57 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -339,11 +339,11 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): sanlock.write_lockspace(b"ls_name", path, iotimeout=1) acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=False) assert acquired is False # This will take 3 seconds. - sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, **{"async": True}) + sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, wait=False) # While the lockspace is being aquired, we expect to get None. time.sleep(1) acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=False) assert acquired is None @@ -351,11 +351,11 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): # Once the lockspace is acquired, we exepect to get True. acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=True) assert acquired is True # This will take about 3 seconds. - sanlock.rem_lockspace(b"ls_name", 1, path, **{"async": True}) + sanlock.rem_lockspace(b"ls_name", 1, path, wait=False) # Wait until the lockspace change state from True to None. while sanlock.inq_lockspace(b"ls_name", 1, path, wait=False): time.sleep(1) @@ -512,19 +512,19 @@ def raises_sanlock_errno(expected_errno=errno.ECONNREFUSED): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.rem_lockspace(name, 1, path, 0) + sanlock.rem_lockspace(name, 1, path, 0, wait=False) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.add_lockspace(name, 1, path, 0) + sanlock.add_lockspace(name, 1, path, 0, wait=False) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): -- 2.17.2

2 1

[sanlock] 14/14: tests: Remove forgotten xfail for unsupported locksapce names in bytes
by pagure＠pagure.io 11 Jun '19

11 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 d923f07a9e8c0de2c8be520081a96efce87393fd Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 11 15:08:43 2019 +0300 tests: Remove forgotten xfail for unsupported locksapce names in bytes This situation is already handled now for both Python versions. --- tests/python_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/python_test.py b/tests/python_test.py index af75020..a2e25fb 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -132,7 +132,6 @@ def test_write_lockspace_4k_invalid_sector_size(sanlock_daemon, user_4k_path): assert e.value.errno == errno.EINVAL -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes are unsupported yet") def test_read_lockspace_4k_invalid_sector_size(sanlock_daemon, user_4k_path): sanlock.write_lockspace( b"ls_name", user_4k_path, iotimeout=1, sector=SECTOR_SIZE_4K) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 13/14: tests: Remove xfail marks from path file names
by pagure＠pagure.io 11 Jun '19

11 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 94b7423028f897a5d6eadec45c533dc8484e50f1 Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Wed Jun 5 16:51:31 2019 +0300 tests: Remove xfail marks from path file names At this point we expect all API calls to handle file paths as either unicode strings or bytes. This applies to both python versions. XPASS/xfail expected for test_write_resource_4k_invalid_sector_size. --- tests/python_test.py | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/tests/python_test.py b/tests/python_test.py index b072d6a..af75020 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -39,22 +39,6 @@ FILE_NAMES = [ #name, encoding ("ascii", None), (u"ascii", None), - pytest.param( - u"\u05d0", None, - marks=pytest.mark.xfail( - six.PY2, - reason="currently not supporting non-ascii paths")), - pytest.param( - u"\u05d0", "utf-8", - marks=pytest.mark.xfail( - six.PY3, - reason="currently not supporting bytes paths")), -] - -FILE_NAMES_NO_XFAILS = [ - #name, encoding - ("ascii", None), - (u"ascii", None), (u"\u05d0", None), (u"\u05d0", "utf-8"), ] @@ -512,7 +496,7 @@ def test_write_resource_invalid_disk(tmpdir, sanlock_daemon, disk): assert repr(disk) in str(e.value) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_killpath(tmpdir, sanlock_daemon, filename, encoding): cmd_path = util.generate_path(tmpdir, filename, encoding) fd = sanlock.register() @@ -527,7 +511,7 @@ def raises_sanlock_errno(expected_errno=errno.ECONNREFUSED): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): @@ -535,7 +519,7 @@ def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): @@ -543,7 +527,7 @@ def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): @@ -551,7 +535,7 @@ def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) disks = [(path, 0)] @@ -563,7 +547,7 @@ def test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)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)] @@ -575,7 +559,7 @@ def test_release_resource_parse_args(no_sanlock_daemon, name, filename, encoding @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)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)] @@ -593,7 +577,7 @@ def test_get_hosts_parse_args(no_sanlock_daemon, name): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_inq_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): @@ -619,7 +603,7 @@ def test_set_event_parse_args(no_sanlock_daemon, name): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_init_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(errno.ENODEV): @@ -627,7 +611,7 @@ def test_init_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) disks = [(path, 0)] @@ -636,19 +620,19 @@ def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): with raises_sanlock_errno(errno.ENOENT): sanlock.init_resource(name, b"res_name", disks) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)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) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_read_lockspace_parse_args(no_sanlock_daemon, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): sanlock.read_lockspace(path) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_read_resource_parse_args(no_sanlock_daemon, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 12/14: python: Add pypath_converter to killpath API
by pagure＠pagure.io 11 Jun '19

11 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 6ab4074acbe0e91d66b7690903641bef3881666c Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 19:13:54 2019 +0300 python: Add pypath_converter to killpath API We would like killpath to be able to handle paths as either unicode and bytes, as well as the ones given in the command args. Stub test for killpath API was modified to permutate over all paths without expected xfails. --- python/sanlock.c | 109 ++++++++++++++++++++++++++++++--------------------- tests/python_test.py | 2 +- 2 files changed, 66 insertions(+), 45 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index b7ffa28..d122c8e 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -1363,6 +1363,51 @@ finally: return ls_list; } +static int +parse_killpath_item(PyObject *item, char *kpargs, size_t *kplen) +{ + int rv = 0, i; + size_t arg_len; + PyObject *path = NULL; + const char *p = NULL; + + if (!pypath_converter(item, &path)) { + goto finally; + } + p = PyBytes_AsString(path); + if (!p) { + goto finally; + } + /* computing the argument length considering the escape chars */ + for (i = 0, arg_len = 0; p[i]; i++, arg_len++) { + if (p[i] == ' ' || p[i] == '\\') arg_len++; + } + + /* 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"); + goto finally; + } + + /* adding the space separator between arguments */ + if (*kplen > 0) { + kpargs[(*kplen)++] = ' '; + } + + while (*p) { + if (*p == ' ' || *p == '\\') { + kpargs[(*kplen)++] = '\\'; + } + + kpargs[(*kplen)++] = *p++; + } + rv = 1; + +finally: + Py_XDECREF(path); + return rv; +} + /* killpath */ PyDoc_STRVAR(pydoc_killpath, "\ killpath(path, args [, slkfd=fd])\n\ @@ -1374,75 +1419,51 @@ The arguments must be in the format: [\"arg1\", \"arg2\", ...]"); static PyObject * py_killpath(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv, i, j, n, num_args, sanlockfd = -1; + int rv = -1, i, num_args, sanlockfd = -1; + size_t kplen; char kpargs[SANLK_HELPER_ARGS_LEN]; - const char *p, *path; - PyObject *argslist, *item; + PyObject *path = NULL; + PyObject *argslist; static char *kwlist[] = {"path", "args", "slkfd", NULL}; /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "sO!|i", kwlist, - &path, &PyList_Type, &argslist, &sanlockfd)) { - return NULL; + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O!|i", kwlist, + pypath_converter, &path, &PyList_Type, &argslist, &sanlockfd)) { + goto finally; } /* checking the path length */ - if (strlen(path) + 1 > SANLK_HELPER_PATH_LEN) { + if (PyBytes_Size(path) + 1 > SANLK_HELPER_PATH_LEN) { __set_exception(EINVAL, "Killpath path argument too long"); - return NULL; + goto finally; } num_args = PyList_Size(argslist); memset(kpargs, 0, SANLK_HELPER_ARGS_LEN); /* creating the arguments string from a python list */ - for (i = 0, n = 0; i < num_args; i++) { - size_t arg_len; - - item = PyList_GetItem(argslist, i); - p = pystring_as_cstring(item); - - if (p == NULL) { - __set_exception(EINVAL, "Killpath argument not a string"); - return NULL; - } - - /* computing the argument length considering the escape chars */ - for (j = 0, arg_len = 0; p[j]; j++, arg_len++) { - if (p[j] == ' ' || p[j] == '\\') arg_len++; - } - - /* adding 2 for the space separator ' ' and the '\0' terminator */ - if (n + arg_len + 2 > SANLK_HELPER_ARGS_LEN) { - __set_exception(EINVAL, "Killpath arguments are too long"); - return NULL; - } - - /* adding the space separator between arguments */ - if (n > 0) { - kpargs[n++] = ' '; - } - - while (*p) { - if (*p == ' ' || *p == '\\') { - kpargs[n++] = '\\'; - } - - kpargs[n++] = *p++; + for (i = 0, kplen = 0; i < num_args; i++) { + PyObject *item = PyList_GetItem(argslist, i); + if (!parse_killpath_item(item, kpargs, &kplen)) { + goto finally; } } /* configure killpath (gil disabled) */ Py_BEGIN_ALLOW_THREADS - rv = sanlock_killpath(sanlockfd, 0, path, kpargs); + rv = sanlock_killpath(sanlockfd, 0, PyBytes_AsString(path), kpargs); Py_END_ALLOW_THREADS if (rv != 0) { - __set_exception(rv, "Killpath script not configured"); - return NULL; + __set_exception(rv, "Killpath script not configured"); + goto finally; } +finally: + Py_XDECREF(path); + if (rv != 0) + return NULL; Py_RETURN_NONE; } diff --git a/tests/python_test.py b/tests/python_test.py index a23d2ec..b072d6a 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -512,7 +512,7 @@ def test_write_resource_invalid_disk(tmpdir, sanlock_daemon, disk): assert repr(disk) in str(e.value) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_killpath(tmpdir, sanlock_daemon, filename, encoding): cmd_path = util.generate_path(tmpdir, filename, encoding) fd = sanlock.register() -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 11/14: python: Apply pypath_converter to rem_lockspace API
by pagure＠pagure.io 11 Jun '19

11 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 083e0236b900564415016db856bccfc22dc409d3 Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 01:01:02 2019 +0300 python: Apply pypath_converter to rem_lockspace API We would like to parse lockspace path as either unicode or bytes. Stub test for rem_lockspace API is set with additional permutation over path with no expected xfails. --- python/sanlock.c | 10 ++++++---- tests/python_test.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index e3b63a7..b7ffa28 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -933,7 +933,7 @@ py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv = -1, async = 0, unused = 0, flags = 0; PyObject *lockspace = NULL; - const char *path; + PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", @@ -943,15 +943,16 @@ py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) memset(&ls, 0, sizeof(struct sanlk_lockspace)); /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&ks|kii", kwlist, - convert_to_pybytes, &lockspace, &ls.host_id, &path, &ls.host_id_disk.offset, + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|kii", kwlist, + convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, + &ls.host_id_disk.offset, &async, &unused)) { goto finally; } /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); - strncpy(ls.host_id_disk.path, path, SANLK_PATH_LEN - 1); + strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* prepare sanlock_rem_lockspace flags */ if (async) { @@ -974,6 +975,7 @@ py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) finally: Py_XDECREF(lockspace); + Py_XDECREF(path); if (rv != 0) return NULL; Py_RETURN_NONE; diff --git a/tests/python_test.py b/tests/python_test.py index 2be57e0..a23d2ec 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -527,7 +527,7 @@ def raises_sanlock_errno(expected_errno=errno.ECONNREFUSED): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 10/14: python: Apply pypath_converter to inq_lockspace API
by pagure＠pagure.io 11 Jun '19

11 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 d105239b7a3c9bce3f39fd11807af038b4ff0fff Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:56:07 2019 +0300 python: Apply pypath_converter to inq_lockspace API We would like to parse lockspace path as either unicode or bytes. Stub test for inq_lockspace API is set with additional permutation for paths with no xfails expected. --- python/sanlock.c | 11 ++++++----- tests/python_test.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 4b7c810..e3b63a7 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -870,7 +870,7 @@ py_inq_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv = BIND_ERROR, waitrs = 0, flags = 0; PyObject *lockspace = NULL; - const char *path; + PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", @@ -880,9 +880,9 @@ py_inq_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) memset(&ls, 0, sizeof(struct sanlk_lockspace)); /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&ks|ki", kwlist, - convert_to_pybytes, &lockspace, &ls.host_id, &path, &ls.host_id_disk.offset, - &waitrs)) { + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|ki", kwlist, + convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, + &ls.host_id_disk.offset, &waitrs)) { goto finally; } @@ -893,7 +893,7 @@ py_inq_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); - strncpy(ls.host_id_disk.path, path, SANLK_PATH_LEN - 1); + strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* add sanlock lockspace (gil disabled) */ Py_BEGIN_ALLOW_THREADS @@ -902,6 +902,7 @@ py_inq_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) finally: Py_XDECREF(lockspace); + Py_XDECREF(path); if (rv == BIND_ERROR) { return NULL; diff --git a/tests/python_test.py b/tests/python_test.py index a9933f4..2be57e0 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -593,7 +593,7 @@ def test_get_hosts_parse_args(no_sanlock_daemon, name): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_inq_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 09/14: python: Apply pypath_converter to add_lockspace
by pagure＠pagure.io 11 Jun '19

11 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 aa7011dea8ca4a0b1f8bc8cc35daf78d3d79b37e Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:52:00 2019 +0300 python: Apply pypath_converter to add_lockspace We should be able to parse lockspace path as either unicode or bytes. New stub test is added for add_lockpace API with path permutation with no xfails expected. --- python/sanlock.c | 11 ++++++----- tests/python_test.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index a846570..4b7c810 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -813,7 +813,7 @@ py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) int rv = -1, async = 0, flags = 0; uint32_t iotimeout = 0; PyObject *lockspace = NULL; - const char *path; + PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", @@ -823,9 +823,9 @@ py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) memset(&ls, 0, sizeof(struct sanlk_lockspace)); /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&ks|kIi", kwlist, - convert_to_pybytes, &lockspace, &ls.host_id, &path, &ls.host_id_disk.offset, - &iotimeout, &async)) { + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&kO&|kIi", kwlist, + convert_to_pybytes, &lockspace, &ls.host_id, pypath_converter, &path, + &ls.host_id_disk.offset, &iotimeout, &async)) { goto finally; } @@ -836,7 +836,7 @@ py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); - strncpy(ls.host_id_disk.path, path, SANLK_PATH_LEN - 1); + strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* add sanlock lockspace (gil disabled) */ Py_BEGIN_ALLOW_THREADS @@ -850,6 +850,7 @@ py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) finally: Py_XDECREF(lockspace); + Py_XDECREF(path); if (rv != 0 ) return NULL; Py_RETURN_NONE; diff --git a/tests/python_test.py b/tests/python_test.py index 3ce1301..a9933f4 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -535,7 +535,7 @@ def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 08/14: python: Apply pypath_converter to read_resource API
by pagure＠pagure.io 11 Jun '19

11 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 e7d716d17f434175ba734bc3abfc96809d25f15b Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:46:16 2019 +0300 python: Apply pypath_converter to read_resource API We should be able to parse resource path as either unicode or bytes. New stub test for read_resource API is added with path premutations with no expected xfails. --- python/sanlock.c | 33 ++++++++++++++++----------------- tests/python_test.py | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index f5051b3..a846570 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -659,9 +659,9 @@ Sector can be one of (512, 4096)."); static PyObject * py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv, rs_len, sector = SECTOR_SIZE_512; + int rv = -1, rs_len, sector = SECTOR_SIZE_512; long align = ALIGNMENT_1M; - const char *path; + PyObject *path = NULL; struct sanlk_resource *rs; PyObject *rs_info = NULL; @@ -681,20 +681,20 @@ py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) rs->num_disks = 1; /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|kli", kwlist, - &path, &(rs->disks[0].offset), &align, &sector)) { - goto exit_fail; + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&|kli", kwlist, + pypath_converter, &path, &(rs->disks[0].offset), &align, &sector)) { + goto finally; } /* prepare the resource disk path */ - strncpy(rs->disks[0].path, path, SANLK_PATH_LEN - 1); + strncpy(rs->disks[0].path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* set alignment/sector flags */ if (add_align_flag(align, &rs->flags) == -1) - goto exit_fail; + goto finally; if (add_sector_flag(sector, &rs->flags) == -1) - goto exit_fail; + goto finally; /* read sanlock resource (gil disabled) */ Py_BEGIN_ALLOW_THREADS @@ -703,7 +703,7 @@ py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) if (rv != 0) { __set_exception(rv, "Sanlock resource read failure"); - goto exit_fail; + goto finally; } /* prepare the dictionary holding the information */ @@ -717,17 +717,16 @@ py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) "resource", rs->name, "version", rs->lver); if (rs_info == NULL) - goto exit_fail; + goto finally; - /* success */ +finally: free(rs); + Py_XDECREF(path); + if (rv != 0) { + Py_XDECREF(rs_info); + return NULL; + } return rs_info; - - /* failure */ -exit_fail: - free(rs); - Py_XDECREF(rs_info); - return NULL; } /* write_resource */ diff --git a/tests/python_test.py b/tests/python_test.py index 66e2b94..3ce1301 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -648,7 +648,7 @@ def test_read_lockspace_parse_args(no_sanlock_daemon, filename, encoding): with raises_sanlock_errno(): sanlock.read_lockspace(path) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_read_resource_parse_args(no_sanlock_daemon, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 07/14: python: Apply pypath_converter to read_lockspace API
by pagure＠pagure.io 11 Jun '19

11 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 876143e598fdcbb9ebf42002effa84de6aa19e37 Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:36:18 2019 +0300 python: Apply pypath_converter to read_lockspace API We should be able to parse lockspace path as either unicode or bytes. New stub test for read_lockspace API was added with path permutations with no xfails expected. --- python/sanlock.c | 25 ++++++++++++++----------- tests/python_test.py | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 6be0e64..f5051b3 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -592,10 +592,10 @@ Sector can be one of (512, 4096)."); static PyObject * py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv, sector = SECTOR_SIZE_512; + int rv = -1, sector = SECTOR_SIZE_512; long align = ALIGNMENT_1M; uint32_t io_timeout = 0; - const char *path; + PyObject *path = NULL; struct sanlk_lockspace ls; PyObject *ls_info = NULL; @@ -605,20 +605,20 @@ py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) memset(&ls, 0, sizeof(struct sanlk_lockspace)); /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|kli", kwlist, - &path, &ls.host_id_disk.offset, &align, &sector)) { - return NULL; + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&|kli", kwlist, + pypath_converter, &path, &ls.host_id_disk.offset, &align, &sector)) { + goto finally; } /* prepare sanlock names */ - strncpy(ls.host_id_disk.path, path, SANLK_PATH_LEN - 1); + strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* set alignment/sector flags */ if (add_align_flag(align, &ls.flags) == -1) - return NULL; + goto finally; if (add_sector_flag(sector, &ls.flags) == -1) - return NULL; + goto finally; /* read sanlock lockspace (gil disabled) */ Py_BEGIN_ALLOW_THREADS @@ -627,7 +627,7 @@ py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) if (rv != 0) { __set_exception(rv, "Sanlock lockspace read failure"); - return NULL; + goto finally; } /* fill the information dictionary */ @@ -640,9 +640,12 @@ py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) "lockspace", ls.name, "iotimeout", io_timeout); if (ls_info == NULL) - return NULL; + goto finally; - /* success */ +finally: + Py_XDECREF(path); + if (rv != 0) + return NULL; return ls_info; } diff --git a/tests/python_test.py b/tests/python_test.py index 23851df..66e2b94 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -642,7 +642,7 @@ def test_get_alignment_parse_args(no_sanlock_daemon, filename, encoding): with raises_sanlock_errno(errno.ENOENT): sanlock.get_alignment(path) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_read_lockspace_parse_args(no_sanlock_daemon, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 06/14: python: Apply pypath_converter to write_lockspace API
by pagure＠pagure.io 11 Jun '19

11 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 1ec25a7e2a6e599980b117b085963e755f6973fb Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:27:27 2019 +0300 python: Apply pypath_converter to write_lockspace API We should be able to parse lockspace path as either unicode or bytes. Stub for write_lockspace test was set with additional permutations over paths with no expected xfails. --- python/sanlock.c | 9 +++++---- tests/python_test.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 2b64b35..6be0e64 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -537,7 +537,7 @@ py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) long align = ALIGNMENT_1M; uint32_t io_timeout = 0; PyObject *lockspace = NULL; - const char *path; + PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "path", "offset", "max_hosts", @@ -547,15 +547,15 @@ py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) memset(&ls, 0, sizeof(struct sanlk_lockspace)); /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&s|kiIli", kwlist, - convert_to_pybytes, &lockspace, &path, &ls.host_id_disk.offset, + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&|kiIli", kwlist, + convert_to_pybytes, &lockspace, pypath_converter, &path, &ls.host_id_disk.offset, &max_hosts, &io_timeout, &align, &sector)) { goto finally; } /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); - strncpy(ls.host_id_disk.path, path, SANLK_PATH_LEN - 1); + strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* set alignment/sector flags */ if (add_align_flag(align, &ls.flags) == -1) @@ -576,6 +576,7 @@ py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) finally: Py_XDECREF(lockspace); + Py_XDECREF(path); if (rv != 0) return NULL; Py_RETURN_NONE; diff --git a/tests/python_test.py b/tests/python_test.py index fb95977..23851df 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -543,7 +543,7 @@ def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 05/14: python: Add pypath_converter to init_lockspace API
by pagure＠pagure.io 11 Jun '19

11 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 4db3d82c86f4b0897d80f3580cf575e39b54636a Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:22:48 2019 +0300 python: Add pypath_converter to init_lockspace API We should be able to parse lockspace path as either unicode or bytes. Stub test for init_lockspace was set with additional permutations over lockspace path with no expected xfails. --- python/sanlock.c | 11 ++++++----- tests/python_test.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 334b237..2b64b35 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -430,7 +430,7 @@ 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; - const char *path; + PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "path", "offset", @@ -440,15 +440,15 @@ py_init_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) memset(&ls, 0, sizeof(struct sanlk_lockspace)); /* parse python tuple */ - if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&s|kiii", kwlist, - convert_to_pybytes, &lockspace, &path, &ls.host_id_disk.offset, &max_hosts, - &num_hosts, &use_aio)) { + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&|kiii", kwlist, + convert_to_pybytes, &lockspace, pypath_converter, &path, &ls.host_id_disk.offset, + &max_hosts, &num_hosts, &use_aio)) { goto finally; } /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); - strncpy(ls.host_id_disk.path, path, SANLK_PATH_LEN - 1); + strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* init sanlock lockspace (gil disabled) */ Py_BEGIN_ALLOW_THREADS @@ -462,6 +462,7 @@ py_init_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) finally: Py_XDECREF(lockspace); + Py_XDECREF(path); if (rv != 0) return NULL; Py_RETURN_NONE; diff --git a/tests/python_test.py b/tests/python_test.py index b251c07..fb95977 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -619,7 +619,7 @@ def test_set_event_parse_args(no_sanlock_daemon, name): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_init_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(errno.ENODEV): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 04/14: python: Apply pypath_converter to get_alignment API
by pagure＠pagure.io 11 Jun '19

11 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 7c697440cb0946926402a02a7534cf2272226853 Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:15:37 2019 +0300 python: Apply pypath_converter to get_alignment API We should be able to parse device path as either unicode or bytes. New stub test was added for get_alignment API for path premutations with no xfails expected. --- python/sanlock.c | 16 ++++++++++------ tests/python_test.py | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index 1a983ee..334b237 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -352,17 +352,17 @@ Get device alignment."); static PyObject * py_get_alignment(PyObject *self __unused, PyObject *args) { - int rv; - const char *path; + int rv = -1; + PyObject *path = NULL; struct sanlk_disk disk; /* parse python tuple */ - if (!PyArg_ParseTuple(args, "s", &path)) { - return NULL; + if (!PyArg_ParseTuple(args, "O&", pypath_converter, &path)) { + goto finally; } memset(&disk, 0, sizeof(struct sanlk_disk)); - strncpy(disk.path, path, SANLK_PATH_LEN - 1); + strncpy(disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* get device alignment (gil disabled) */ Py_BEGIN_ALLOW_THREADS @@ -371,9 +371,13 @@ py_get_alignment(PyObject *self __unused, PyObject *args) if (rv < 0) { __set_exception(rv, "Unable to get device alignment"); - return NULL; + goto finally; } +finally: + Py_XDECREF(path); + if (rv < 0) + return NULL; return Py_BuildValue("i", rv); } diff --git a/tests/python_test.py b/tests/python_test.py index 56d0c99..b251c07 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -636,7 +636,7 @@ def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): with raises_sanlock_errno(errno.ENOENT): sanlock.init_resource(name, b"res_name", disks) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_get_alignment_parse_args(no_sanlock_daemon, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(errno.ENOENT): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 03/14: python: Apply pypath_converter to parse_resource util function
by pagure＠pagure.io 11 Jun '19

11 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 5453f0795d688fb6a8aa0b62a3c1d3815807b72c Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Tue Jun 4 00:03:25 2019 +0300 python: Apply pypath_converter to parse_resource util function We should be able to parse resource paths as either unicode or bytes. Stub tests involving valid arguments parsing of resources paths are set with additional permutations with no xfails expected. --- python/sanlock.c | 46 +++++++++++++++++++++++++++++----------------- tests/python_test.py | 16 ++++++++++++---- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index aaeaa86..1a983ee 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -160,6 +160,33 @@ pystring_as_cstring(PyObject *obj) } static int +parse_single_disk(PyObject* disk, struct sanlk_disk* res_disk) +{ + int rv = 0; + PyObject *path = NULL; + uint64_t offset; + + if (!PyTuple_Check(disk)) { + set_error(PyExc_ValueError, "Invalid disk %s", disk); + goto finally; + } + + if (!PyArg_ParseTuple(disk, "O&K", pypath_converter, &path, &offset)) { + /* Override the error since it confusing in this context. */ + set_error(PyExc_ValueError, "Invalid disk %s", disk); + goto finally; + } + + strncpy(res_disk->path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); + res_disk->offset = offset; + rv = 1; + +finally: + Py_XDECREF(path); + return rv; +} + +static int __parse_resource(PyObject *obj, struct sanlk_resource **res_ret) { int i, num_disks, res_len; @@ -180,26 +207,11 @@ __parse_resource(PyObject *obj, struct sanlk_resource **res_ret) res->num_disks = num_disks; for (i = 0; i < num_disks; i++) { - PyObject *disk; - const char *path; - uint64_t offset; + PyObject *disk = PyList_GetItem(obj,i); - disk = PyList_GetItem(obj, i); - - if (!PyTuple_Check(disk)) { - set_error(PyExc_ValueError, "Invalid disk %s", disk); + if (!parse_single_disk(disk, &(res->disks[i]))) { goto exit_fail; - } - - if (!PyArg_ParseTuple(disk, "sK", &path, &offset)) { - /* Override the error since it confusing in this context. */ - set_error(PyExc_ValueError, "Invalid disk %s", disk); - goto exit_fail; - } - - strncpy(res->disks[i].path, path, SANLK_PATH_LEN - 1); - res->disks[i].offset = offset; } *res_ret = res; diff --git a/tests/python_test.py b/tests/python_test.py index 5218435..56d0c99 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -51,6 +51,14 @@ FILE_NAMES = [ reason="currently not supporting bytes paths")), ] +FILE_NAMES_NO_XFAILS = [ + #name, encoding + ("ascii", None), + (u"ascii", None), + (u"\u05d0", None), + (u"\u05d0", "utf-8"), +] + LOCKSPACE_OR_RESOURCE_NAMES = [ # Bytes are supported with python 2 and 3. pytest.param(b"\xd7\x90"), @@ -543,7 +551,7 @@ def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) disks = [(path, 0)] @@ -555,7 +563,7 @@ def test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_release_resource_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) disks = [(path, 0)] @@ -567,7 +575,7 @@ def test_release_resource_parse_args(no_sanlock_daemon, name, filename, encoding @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_read_resource_owners_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) disks = [(path, 0)] @@ -619,7 +627,7 @@ def test_init_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS) def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) disks = [(path, 0)] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/14: python: Add pypath_converter
by pagure＠pagure.io 11 Jun '19

11 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 b8770c3bebb2e77c2b1d1e23b77a93f14dac72df Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Mon Jun 3 23:11:33 2019 +0300 python: Add pypath_converter In Python 3 we would like to handle paths as either unicode strings or bytes. For this purpose we have a c-API called PyUnicode_FSConverter. In this patch the missing API is implemented for Py2 based on Py3 [1] and a unified no-cleanup behavior is enforced for Py3 path conversion as well. [1] https://github.com/python/cpython/blob/master/Objects/unicodeobject.c#L3818 --- python/sanlock.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/python/sanlock.c b/python/sanlock.c index 39a9fb6..aaeaa86 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -73,6 +73,60 @@ __set_exception(int en, char *msg) } } + +/* + * Converts a unicode path into PyBytes object. + * If conversion succeeds addr will hold a reference to a new + * PyBytes object containing bytes represenation of the system path + * given in arg object. + * Returns 1 on successful operation, 0 otherwise. + * Py2 implementation is based on Py3's PyUnicode_FSConverter[1]. + * Py3 implementation wraps call PyUnicode_FSConverter and eliminates + * the cleanup support in order to make usage flow the same between + * versions. + * [1] https://github.com/python/cpython/blob/master/Objects/unicodeobject.c#L3818 + */ +static int +pypath_converter(PyObject* arg, void* addr) +{ + assert(arg && "path converter does not support cleanup (arg is NULL)"); + +#if PY_MAJOR_VERSION == 2 + /* python 2 implementation */ + PyObject *output = NULL; + Py_ssize_t size; + const char *data; + + if (PyBytes_Check(arg)) { + Py_INCREF(arg); + output = arg; + } else { + output = PyUnicode_AsEncodedString(arg, Py_FileSystemDefaultEncoding, NULL); + if (!output) + return 0; + assert(PyBytes_Check(output)); + } + + size = PyBytes_GET_SIZE(output); + data = PyBytes_AS_STRING(output); + if ((size_t)size != strlen(data)) { + PyErr_Format(PyExc_ValueError, "Embedded null byte"); + Py_DECREF(output); + return 0; + } + + *(PyObject**)addr = output; + return 1; +#else + /* python 3 call wrapper */ + int rv = PyUnicode_FSConverter(arg, addr); + /* python 2 does not suppot cleanups - same applies here */ + if (rv == Py_CLEANUP_SUPPORTED) + rv = 1; + return rv; +#endif +} + static uint64_t pyinteger_as_unsigned_long_long_mask(PyObject *obj) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/14: tests: Add path conversion tests to stub tests section
by pagure＠pagure.io 11 Jun '19

11 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 f4eefcf68229a308a0cae453d2511353a3d49822 Author: Amit Bawer <abawer(a)redhat.com> AuthorDate: Wed Jun 5 15:49:49 2019 +0300 tests: Add path conversion tests to stub tests section We add tests for path permutations involving xfail secnarios to stub argument parsing tests. Also adding missing API tests. Once we apply all patches involving the new path converter, we expect all of them to pass with no fails in both python versions. --- tests/python_test.py | 82 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/tests/python_test.py b/tests/python_test.py index 926a0f0..5218435 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -519,48 +519,63 @@ def raises_sanlock_errno(expected_errno=errno.ECONNREFUSED): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_rem_lockspace_parse_args(no_sanlock_daemon, name): +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.rem_lockspace(name, 1, "ls_path", 0) + sanlock.rem_lockspace(name, 1, path, 0) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_add_lockspace_parse_args(no_sanlock_daemon, name): +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.add_lockspace(name, 1, "ls_path", 0) + sanlock.add_lockspace(name, 1, path, 0) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_write_lockspace_parse_args(no_sanlock_daemon, name): +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.write_lockspace(name, "ls_path") + sanlock.write_lockspace(name, path) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_write_resource_parse_args(no_sanlock_daemon, name): +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) + disks = [(path, 0)] with raises_sanlock_errno(): - sanlock.write_resource(name, b"res_name", [("disk_path",0)]) + sanlock.write_resource(name, b"res_name", disks) with raises_sanlock_errno(): - sanlock.write_resource(b"ls_name", name, [("disk_path",0)]) + sanlock.write_resource(b"ls_name", name, disks) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_release_resource_parse_args(no_sanlock_daemon, name): +(a)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)] with raises_sanlock_errno(): - sanlock.release(name, b"res_name", [("disk_path",0)]) + sanlock.release(name, b"res_name", disks) with raises_sanlock_errno(): - sanlock.release(b"ls_name", name, [("disk_path",0)]) + sanlock.release(b"ls_name", name, disks) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_read_resource_owners_parse_args(no_sanlock_daemon, name): +(a)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)] with raises_sanlock_errno(): - sanlock.read_resource_owners(name, b"res_name", [("disk_path",0)]) + sanlock.read_resource_owners(name, b"res_name", disks) with raises_sanlock_errno(): - sanlock.read_resource_owners(b"ls_name", name, [("disk_path",0)]) + sanlock.read_resource_owners(b"ls_name", name, disks) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @@ -570,9 +585,11 @@ def test_get_hosts_parse_args(no_sanlock_daemon, name): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_inq_lockspace_parse_args(no_sanlock_daemon, name): +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_inq_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.inq_lockspace(name, 1, "path", wait=False) + sanlock.inq_lockspace(name, 1, path, wait=False) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @@ -594,15 +611,38 @@ def test_set_event_parse_args(no_sanlock_daemon, name): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_init_lockspace_parse_args(no_sanlock_daemon, name): +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_init_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(errno.ENODEV): - sanlock.init_lockspace(name, "path") + sanlock.init_lockspace(name, path) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) -def test_init_resource_parse_args(no_sanlock_daemon, name): - disks = [("path", 0)] +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) + disks = [(path, 0)] 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.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) + +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +def test_read_lockspace_parse_args(no_sanlock_daemon, filename, encoding): + path = util.generate_path("/tmp/", filename, encoding) + with raises_sanlock_errno(): + sanlock.read_lockspace(path) + +(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES) +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) + -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH] python: Replace async with wait
by Nir Soffer 11 Jun '19

11 Jun '19

The async argument to add_lockspace and rem_lockspace is not valid syntax in python 3.7, since async is a keyword now. Replace async=False with wait=True, already used in other sanlock methods. This change break compatibility with python 2, but we need to release version for python 3 now, so we don't have time to finish a python 2 compatible version. Once we release 3.8.0, we will have more time to work on python 2 compatibility to help users like vdsm, which can be released in 3.8.1. [1] https://github.com/nirs/sanlock/pull/16 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/sanlock.c | 26 ++++++++++++++------------ tests/python_test.py | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index d122c8e..7f0916a 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -799,40 +799,41 @@ finally: Py_RETURN_NONE; } /* add_lockspace */ PyDoc_STRVAR(pydoc_add_lockspace, "\ -add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, async=False)\n\ -Add a lockspace, acquiring a host_id in it. If async is True the function\n\ +add_lockspace(lockspace, host_id, path, offset=0, iotimeout=0, wait=True)\n\ +Add a lockspace, acquiring a host_id in it. If wait is False the function\n\ will return immediatly and the status can be checked using inq_lockspace.\n\ The iotimeout option configures the io timeout for the specific lockspace,\n\ overriding the default value (see the sanlock daemon parameter -o)."); static PyObject * py_add_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, async = 0, flags = 0; + int rv = -1, flags = 0; + int wait = 1; uint32_t iotimeout = 0; PyObject *lockspace = NULL; PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", - "iotimeout", "async", NULL}; + "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, - &ls.host_id_disk.offset, &iotimeout, &async)) { + &ls.host_id_disk.offset, &iotimeout, &wait)) { goto finally; } /* prepare sanlock_add_lockspace flags */ - if (async) { + if (!wait) { flags |= SANLK_ADD_ASYNC; } /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); @@ -918,46 +919,47 @@ finally: return NULL; } /* rem_lockspace */ PyDoc_STRVAR(pydoc_rem_lockspace, "\ -rem_lockspace(lockspace, host_id, path, offset=0, async=False, unused=False)\n\ -Remove a lockspace, releasing the acquired host_id. If async is True the\n\ +rem_lockspace(lockspace, host_id, path, offset=0, wait=True, unused=False)\n\ +Remove a lockspace, releasing the acquired host_id. If wait is False the\n\ function will return immediately and the status can be checked using\n\ inq_lockspace. If unused is True the command will fail (EBUSY) if there is\n\ at least one acquired resource in the lockspace. Otherwise (the default)\n\ sanlock will try to terminate processes holding resource leases and upon\n\ successful termination these leases will be released."); static PyObject * py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { - int rv = -1, async = 0, unused = 0, flags = 0; + int rv = -1, unused = 0, flags = 0; + int wait = 1; PyObject *lockspace = NULL; PyObject *path = NULL; struct sanlk_lockspace ls; static char *kwlist[] = {"lockspace", "host_id", "path", "offset", - "async", "unused", NULL}; + "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, &ls.host_id_disk.offset, - &async, &unused)) { + &wait, &unused)) { goto finally; } /* prepare sanlock names */ strncpy(ls.name, PyBytes_AsString(lockspace), SANLK_NAME_LEN); strncpy(ls.host_id_disk.path, PyBytes_AsString(path), SANLK_PATH_LEN - 1); /* prepare sanlock_rem_lockspace flags */ - if (async) { + if (!wait) { flags |= SANLK_REM_ASYNC; } if (unused) { flags |= SANLK_REM_UNUSED; diff --git a/tests/python_test.py b/tests/python_test.py index a2e25fb..3242f57 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -339,11 +339,11 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): sanlock.write_lockspace(b"ls_name", path, iotimeout=1) acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=False) assert acquired is False # This will take 3 seconds. - sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, **{"async": True}) + sanlock.add_lockspace(b"ls_name", 1, path, iotimeout=1, wait=False) # While the lockspace is being aquired, we expect to get None. time.sleep(1) acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=False) assert acquired is None @@ -351,11 +351,11 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): # Once the lockspace is acquired, we exepect to get True. acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=True) assert acquired is True # This will take about 3 seconds. - sanlock.rem_lockspace(b"ls_name", 1, path, **{"async": True}) + sanlock.rem_lockspace(b"ls_name", 1, path, wait=False) # Wait until the lockspace change state from True to None. while sanlock.inq_lockspace(b"ls_name", 1, path, wait=False): time.sleep(1) @@ -512,19 +512,19 @@ def raises_sanlock_errno(expected_errno=errno.ECONNREFUSED): @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.rem_lockspace(name, 1, path, 0) + sanlock.rem_lockspace(name, 1, path, 0, wait=False) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): path = util.generate_path("/tmp/", filename, encoding) with raises_sanlock_errno(): - sanlock.add_lockspace(name, 1, path, 0) + sanlock.add_lockspace(name, 1, path, 0, wait=False) @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) @pytest.mark.parametrize("filename,encoding", FILE_NAMES) def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding): -- 2.17.2

1 0

[PATCH 00/13] Fix path handling
by Nir Soffer 11 Jun '19

11 Jun '19

Path arguments are handled now similar to the standard library, supporting both bytes and Unicode paths. Unicode paths are encoded using the file system encoding. sanlock.killpath() argumnets are handled now in the same way as the path argument, supporting non-ascii arguments. For simplicity, python 2 version behave like python 3, supporting Unicode paths with non-ascii content. Amit Bawer (13): tests: Add path conversion tests to stub tests section python: Add pypath_converter python: Apply pypath_converter to parse_resource util function python: Apply pypath_converter to get_alignment API python: Add pypath_converter to init_lockspace API python: Apply pypath_converter to write_lockspace API python: Apply pypath_converter to read_lockspace API python: Apply pypath_converter to read_resource API python: Apply pypath_converter to add_lockspace python: Apply pypath_converter to inq_lockspace API python: Apply pypath_converter to rem_lockspace API python: Add pypath_converter to killpath API tests: Remove xfail marks from path file names python/sanlock.c | 335 ++++++++++++++++++++++++++++--------------- tests/python_test.py | 94 ++++++++---- 2 files changed, 280 insertions(+), 149 deletions(-) -- 2.17.2

1 13

Re: [PATCH 14/18] python: Use PyBytes converter for read_resource_owners API
by Amit Bawer 10 Jun '19

10 Jun '19

i noticed that while working on it, but its more readable to know we handle the bad situation explicitly. On Mon, Jun 10, 2019 at 7:07 PM Pavel Bar <pbar(a)redhat.com> wrote: > If "rv != 0", "ls_list" is NULL, so returning "ls_list" is totally the > same as returning NULL explicitly. That's what the old code did. > But I'm totally for leaving the 2 lines that you added, because they do > add for both readability, maintenance and stability for future changes > (what if "ls_list" will be updated before we jump to "finally"). > > > > On Mon, Jun 10, 2019 at 6:59 PM Amit Bawer <abawer(a)redhat.com> wrote: > >> we check for sanlock rv error and return NULL when rv != 0, this if is >> not redundant at all. >> >> On Mon, Jun 10, 2019 at 6:55 PM Pavel Bar <pbar(a)redhat.com> wrote: >> >>> I was talking about other 2 lines: >>> >>>> + if (rv != 0) >>>> + return NULL; >>>> >>> >>> >>> On Mon, Jun 10, 2019 at 6:53 PM Amit Bawer <abawer(a)redhat.com> wrote: >>> >>>> that's why they are called redundant. nobody needs them. >>>> both pointer are initialized to NULL if not allocated, so call to free >>>> is safe by ISO-C standards. >>>> >>>> On Mon, Jun 10, 2019 at 5:29 PM Pavel Bar <pbar(a)redhat.com> wrote: >>>> >>>>> >>>>> >>>>> On Mon, Jun 3, 2019 at 11:31 PM Nir Soffer <nirsof(a)gmail.com> wrote: >>>>> >>>>>> From: Amit Bawer <abawer(a)redhat.com> >>>>>> >>>>>> Implications: >>>>>> >>>>>> - Py2 : no difference >>>>>> - Py3 : if used, only accept bytes for lockspace name. >>>>>> --- >>>>>> python/sanlock.c | 33 +++++++++++++++++++-------------- >>>>>> 1 file changed, 19 insertions(+), 14 deletions(-) >>>>>> >>>>>> diff --git a/python/sanlock.c b/python/sanlock.c >>>>>> index 0964671..ed9b4f0 100644 >>>>>> --- a/python/sanlock.c >>>>>> +++ b/python/sanlock.c >>>>>> @@ -1226,59 +1226,64 @@ Align can be one of (1048576, 2097152, >>>>>> 4194304, 8388608).\n\ >>>>>> Sector can be one of (512, 4096)."); >>>>>> >>>>>> static PyObject * >>>>>> py_read_resource_owners(PyObject *self __unused, PyObject *args, >>>>>> PyObject *keywds) >>>>>> { >>>>>> - int rv, hss_count = 0; >>>>>> + int rv = -1, hss_count = 0; >>>>>> int sector = SECTOR_SIZE_512; >>>>>> long align = ALIGNMENT_1M; >>>>>> - const char *lockspace, *resource; >>>>>> + PyObject *lockspace = NULL, *resource = NULL; >>>>>> struct sanlk_resource *res = NULL; >>>>>> struct sanlk_host *hss = NULL; >>>>>> PyObject *disks, *ls_list = NULL; >>>>>> >>>>>> static char *kwlist[] = {"lockspace", "resource", "disks", >>>>>> "align", >>>>>> "sector", NULL}; >>>>>> >>>>>> /* parse python tuple */ >>>>>> - if (!PyArg_ParseTupleAndKeywords(args, keywds, "ssO!|li", kwlist, >>>>>> - &lockspace, &resource, &PyList_Type, &disks, &align, >>>>>> &sector)) { >>>>>> - return NULL; >>>>>> + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&O!|li", >>>>>> kwlist, >>>>>> + convert_to_pybytes, &lockspace, convert_to_pybytes, >>>>>> &resource, >>>>>> + &PyList_Type, &disks, &align, &sector)) { >>>>>> + goto finally; >>>>>> } >>>>>> >>>>>> /* parse and check sanlock resource */ >>>>>> if (__parse_resource(disks, &res) < 0) { >>>>>> - return NULL; >>>>>> + goto finally; >>>>>> } >>>>>> >>>>>> /* prepare sanlock names */ >>>>>> - strncpy(res->lockspace_name, lockspace, SANLK_NAME_LEN); >>>>>> - strncpy(res->name, resource, SANLK_NAME_LEN); >>>>>> + strncpy(res->lockspace_name, PyBytes_AsString(lockspace), >>>>>> SANLK_NAME_LEN); >>>>>> + strncpy(res->name, PyBytes_AsString(resource), SANLK_NAME_LEN); >>>>>> >>>>>> /* set resource alignment and sector flags */ >>>>>> >>>>>> if (add_align_flag(align, &res->flags) == -1) >>>>>> - goto exit_fail; >>>>>> + goto finally; >>>>>> >>>>>> if (add_sector_flag(sector, &res->flags) == -1) >>>>>> - goto exit_fail; >>>>>> + goto finally; >>>>>> >>>>>> /* read resource owners (gil disabled) */ >>>>>> Py_BEGIN_ALLOW_THREADS >>>>>> rv = sanlock_read_resource_owners(res, 0, &hss, &hss_count); >>>>>> Py_END_ALLOW_THREADS >>>>>> >>>>>> if (rv != 0) { >>>>>> __set_exception(rv, "Unable to read resource owners"); >>>>>> - goto exit_fail; >>>>>> + goto finally; >>>>>> } >>>>>> >>>>>> ls_list = __hosts_to_list(hss, hss_count); >>>>>> >>>>>> -exit_fail: >>>>>> - if (res) free(res); >>>>>> - if (hss) free(hss); >>>>>> +finally: >>>>>> + Py_XDECREF(lockspace); >>>>>> + Py_XDECREF(resource); >>>>>> + free(res); >>>>>> + free(hss); >>>>>> + if (rv != 0) >>>>>> + return NULL; >>>>>> >>>>> >>>>> The above 2 lines (the "if" statement) are redundant, that's why they >>>>> were not in the original code. Although they do add for readability, so >>>>> better leave them. >>>>> >>>>> >>>>>> return ls_list; >>>>>> } >>>>>> >>>>>> /* killpath */ >>>>>> PyDoc_STRVAR(pydoc_killpath, "\ >>>>>> -- >>>>>> 2.17.2 >>>>>> >>>>>>

1 0

Re: [PATCH 14/18] python: Use PyBytes converter for read_resource_owners API
by Amit Bawer 10 Jun '19

10 Jun '19

we check for sanlock rv error and return NULL when rv != 0, this if is not redundant at all. On Mon, Jun 10, 2019 at 6:55 PM Pavel Bar <pbar(a)redhat.com> wrote: > I was talking about other 2 lines: > >> + if (rv != 0) >> + return NULL; >> > > > On Mon, Jun 10, 2019 at 6:53 PM Amit Bawer <abawer(a)redhat.com> wrote: > >> that's why they are called redundant. nobody needs them. >> both pointer are initialized to NULL if not allocated, so call to free is >> safe by ISO-C standards. >> >> On Mon, Jun 10, 2019 at 5:29 PM Pavel Bar <pbar(a)redhat.com> wrote: >> >>> >>> >>> On Mon, Jun 3, 2019 at 11:31 PM Nir Soffer <nirsof(a)gmail.com> wrote: >>> >>>> From: Amit Bawer <abawer(a)redhat.com> >>>> >>>> Implications: >>>> >>>> - Py2 : no difference >>>> - Py3 : if used, only accept bytes for lockspace name. >>>> --- >>>> python/sanlock.c | 33 +++++++++++++++++++-------------- >>>> 1 file changed, 19 insertions(+), 14 deletions(-) >>>> >>>> diff --git a/python/sanlock.c b/python/sanlock.c >>>> index 0964671..ed9b4f0 100644 >>>> --- a/python/sanlock.c >>>> +++ b/python/sanlock.c >>>> @@ -1226,59 +1226,64 @@ Align can be one of (1048576, 2097152, 4194304, >>>> 8388608).\n\ >>>> Sector can be one of (512, 4096)."); >>>> >>>> static PyObject * >>>> py_read_resource_owners(PyObject *self __unused, PyObject *args, >>>> PyObject *keywds) >>>> { >>>> - int rv, hss_count = 0; >>>> + int rv = -1, hss_count = 0; >>>> int sector = SECTOR_SIZE_512; >>>> long align = ALIGNMENT_1M; >>>> - const char *lockspace, *resource; >>>> + PyObject *lockspace = NULL, *resource = NULL; >>>> struct sanlk_resource *res = NULL; >>>> struct sanlk_host *hss = NULL; >>>> PyObject *disks, *ls_list = NULL; >>>> >>>> static char *kwlist[] = {"lockspace", "resource", "disks", "align", >>>> "sector", NULL}; >>>> >>>> /* parse python tuple */ >>>> - if (!PyArg_ParseTupleAndKeywords(args, keywds, "ssO!|li", kwlist, >>>> - &lockspace, &resource, &PyList_Type, &disks, &align, &sector)) >>>> { >>>> - return NULL; >>>> + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&O!|li", kwlist, >>>> + convert_to_pybytes, &lockspace, convert_to_pybytes, &resource, >>>> + &PyList_Type, &disks, &align, &sector)) { >>>> + goto finally; >>>> } >>>> >>>> /* parse and check sanlock resource */ >>>> if (__parse_resource(disks, &res) < 0) { >>>> - return NULL; >>>> + goto finally; >>>> } >>>> >>>> /* prepare sanlock names */ >>>> - strncpy(res->lockspace_name, lockspace, SANLK_NAME_LEN); >>>> - strncpy(res->name, resource, SANLK_NAME_LEN); >>>> + strncpy(res->lockspace_name, PyBytes_AsString(lockspace), >>>> SANLK_NAME_LEN); >>>> + strncpy(res->name, PyBytes_AsString(resource), SANLK_NAME_LEN); >>>> >>>> /* set resource alignment and sector flags */ >>>> >>>> if (add_align_flag(align, &res->flags) == -1) >>>> - goto exit_fail; >>>> + goto finally; >>>> >>>> if (add_sector_flag(sector, &res->flags) == -1) >>>> - goto exit_fail; >>>> + goto finally; >>>> >>>> /* read resource owners (gil disabled) */ >>>> Py_BEGIN_ALLOW_THREADS >>>> rv = sanlock_read_resource_owners(res, 0, &hss, &hss_count); >>>> Py_END_ALLOW_THREADS >>>> >>>> if (rv != 0) { >>>> __set_exception(rv, "Unable to read resource owners"); >>>> - goto exit_fail; >>>> + goto finally; >>>> } >>>> >>>> ls_list = __hosts_to_list(hss, hss_count); >>>> >>>> -exit_fail: >>>> - if (res) free(res); >>>> - if (hss) free(hss); >>>> +finally: >>>> + Py_XDECREF(lockspace); >>>> + Py_XDECREF(resource); >>>> + free(res); >>>> + free(hss); >>>> + if (rv != 0) >>>> + return NULL; >>>> >>> >>> The above 2 lines (the "if" statement) are redundant, that's why they >>> were not in the original code. Although they do add for readability, so >>> better leave them. >>> >>> >>>> return ls_list; >>>> } >>>> >>>> /* killpath */ >>>> PyDoc_STRVAR(pydoc_killpath, "\ >>>> -- >>>> 2.17.2 >>>> >>>>

1 0

Re: [PATCH 11/18] python: Use PyBytes converter for resource acquire API
by Amit Bawer 10 Jun '19

10 Jun '19

the original check here is for rv != 0. and cleanup code checks the same. if we want to change the rv checks for sanlock calls we probably should to that in a separate patch, not related to py3 changes anyway. On Mon, Jun 10, 2019 at 3:41 PM Pavel Bar <pbar(a)redhat.com> wrote: > > > On Mon, Jun 3, 2019 at 11:31 PM Nir Soffer <nirsof(a)gmail.com> wrote: > >> From: Amit Bawer <abawer(a)redhat.com> >> >> Implications: >> >> - Py2 : no difference >> - Py3 : if used, only accept bytes for lockspace/resource name. >> --- >> python/sanlock.c | 35 ++++++++++++++++++----------------- >> 1 file changed, 18 insertions(+), 17 deletions(-) >> >> diff --git a/python/sanlock.c b/python/sanlock.c >> index c7518c6..7bdbd69 100644 >> --- a/python/sanlock.c >> +++ b/python/sanlock.c >> @@ -1028,39 +1028,39 @@ mode. The version is the version of the lease >> that must be acquired or fail.\n\ >> The disks must be in the format: [(path, offset), ... ]\n"); >> >> static PyObject * >> py_acquire(PyObject *self __unused, PyObject *args, PyObject *keywds) >> { >> - int rv, sanlockfd = -1, pid = -1, shared = 0; >> - const char *lockspace, *resource; >> - struct sanlk_resource *res; >> + int rv = -1, sanlockfd = -1, pid = -1, shared = 0; >> + PyObject *lockspace = NULL, *resource = NULL; >> + struct sanlk_resource *res = NULL; >> PyObject *disks, *version = Py_None; >> >> static char *kwlist[] = {"lockspace", "resource", "disks", "slkfd", >> "pid", "shared", "version", NULL}; >> >> /* parse python tuple */ >> - if (!PyArg_ParseTupleAndKeywords(args, keywds, "ssO!|iiiO", kwlist, >> - &lockspace, &resource, &PyList_Type, &disks, &sanlockfd, &pid, >> - &shared, &version)) { >> - return NULL; >> + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&O!|iiiO", kwlist, >> + convert_to_pybytes, &lockspace, convert_to_pybytes, &resource, >> + &PyList_Type, &disks, &sanlockfd, &pid, &shared, &version)) { >> + goto finally; >> } >> >> /* check if any of the slkfd or pid parameters was given */ >> if (sanlockfd == -1 && pid == -1) { >> __set_exception(EINVAL, "Invalid slkfd and pid values"); >> - return NULL; >> + goto finally; >> } >> >> /* parse and check sanlock resource */ >> if (__parse_resource(disks, &res) < 0) { >> - return NULL; >> + goto finally; >> } >> >> /* prepare sanlock names */ >> - strncpy(res->lockspace_name, lockspace, SANLK_NAME_LEN); >> - strncpy(res->name, resource, SANLK_NAME_LEN); >> + strncpy(res->lockspace_name, PyBytes_AsString(lockspace), >> SANLK_NAME_LEN); >> + strncpy(res->name, PyBytes_AsString(resource), SANLK_NAME_LEN); >> >> /* prepare sanlock flags */ >> if (shared) { >> res->flags |= SANLK_RES_SHARED; >> } >> @@ -1069,30 +1069,31 @@ py_acquire(PyObject *self __unused, PyObject >> *args, PyObject *keywds) >> if (version != Py_None) { >> 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"); >> - goto exit_fail; >> + goto finally; >> } >> } >> >> /* acquire sanlock resource (gil disabled) */ >> Py_BEGIN_ALLOW_THREADS >> rv = sanlock_acquire(sanlockfd, pid, 0, 1, &res, 0); >> Py_END_ALLOW_THREADS >> >> if (rv != 0) { >> __set_exception(rv, "Sanlock resource not acquired"); >> - goto exit_fail; >> + goto finally; >> } >> >> +finally: >> + Py_XDECREF(lockspace); >> + Py_XDECREF(resource); >> free(res); >> + if (rv != 0) >> > > Is it intentional "rv != 0" instead of "rv < 0"? I do see "rv != 0" in the > existing code a few lines above in the method, but wasn't it a mistake? If > the convention is that any non-negative is a success, then it should be > changed. > > >> + return NULL; >> Py_RETURN_NONE; >> - >> -exit_fail: >> - free(res); >> - return NULL; >> } >> >> /* release */ >> PyDoc_STRVAR(pydoc_release, "\ >> release(lockspace, resource, disks [, slkfd=fd, pid=owner])\n\ >> -- >> 2.17.2 >> >>

1 0

Re: [PATCH 18/18] tests: Remove xfail marks for unsupported lockspace/res names as bytes
by Amit Bawer 10 Jun '19

10 Jun '19

guess we could omit the "for". "specifically" is good enough. On Mon, Jun 10, 2019 at 6:30 PM Pavel Bar <pbar(a)redhat.com> wrote: > > > On Mon, Jun 3, 2019 at 11:31 PM Nir Soffer <nirsof(a)gmail.com> wrote: > >> From: Amit Bawer <abawer(a)redhat.com> >> >> From this point, all API tests for should PASS or xfail specifically. >> > > Redundant "for". Or need to add something after "for". > Suggestion if I understood you correctly: "specifically" --> "explicitly" > > >> XPASS is only known for python 3 on read invalid 4k sector size test. >> --- >> tests/python_test.py | 21 +-------------------- >> 1 file changed, 1 insertion(+), 20 deletions(-) >> >> diff --git a/tests/python_test.py b/tests/python_test.py >> index 7093aac..926a0f0 100644 >> --- a/tests/python_test.py >> +++ b/tests/python_test.py >> @@ -51,24 +51,21 @@ FILE_NAMES = [ >> reason="currently not supporting bytes paths")), >> ] >> >> LOCKSPACE_OR_RESOURCE_NAMES = [ >> # Bytes are supported with python 2 and 3. >> - pytest.param( >> - b"\xd7\x90", >> - marks=pytest.mark.xfail(six.PY3, reason="bytes support not >> implemented yet")), >> + pytest.param(b"\xd7\x90"), >> # Python 2 also supports str. >> pytest.param( >> "\xd7\x90", >> marks=pytest.mark.skipif(six.PY3, reason="python 3 supports only >> bytes")), >> # Python 2 also supports unicode with ascii content. >> pytest.param( >> u"ascii", >> marks=pytest.mark.skipif(six.PY3, reason="python 3 supports only >> bytes")), >> ] >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("filename, encoding" , FILE_NAMES) >> @pytest.mark.parametrize("size,offset", [ >> # Smallest offset. >> (LOCKSPACE_SIZE, 0), >> # Large offset. >> @@ -105,11 +102,10 @@ def test_write_lockspace(tmpdir, sanlock_daemon, >> filename, encoding, size, offse >> # TODO: check more stuff here... >> >> util.check_guard(path, size) >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("align", sanlock.ALIGN_SIZE) >> def test_write_lockspace_4k(user_4k_path, sanlock_daemon, align): >> >> # Poison lockspace area, ensuring that previous tests will not break >> this >> # test, and sanlock does not write beyond the lockspace area. >> @@ -135,11 +131,10 @@ def test_write_lockspace_4k(user_4k_path, >> sanlock_daemon, align): >> >> # Check that sanlock did not write beyond the lockspace area. >> util.check_guard(user_4k_path, align) >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> def test_write_lockspace_4k_invalid_sector_size(sanlock_daemon, >> user_4k_path): >> with pytest.raises(sanlock.SanlockException) as e: >> sanlock.write_lockspace( >> b"ls_name", user_4k_path, iotimeout=1, >> sector=SECTOR_SIZE_512) >> assert e.value.errno == errno.EINVAL >> @@ -153,11 +148,10 @@ def >> test_read_lockspace_4k_invalid_sector_size(sanlock_daemon, user_4k_path): >> with pytest.raises(sanlock.SanlockException) as e: >> sanlock.read_lockspace(user_4k_path, sector=SECTOR_SIZE_512) >> assert e.value.errno == errno.EINVAL >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("filename,encoding", FILE_NAMES) >> @pytest.mark.parametrize("size,offset", [ >> # Smallest offset. >> (MIN_RES_SIZE, 0), >> # Large offset. >> @@ -202,11 +196,10 @@ def test_write_resource(tmpdir, sanlock_daemon, >> filename, encoding, size, offset >> # TODO: check more stuff here... >> >> util.check_guard(path, size) >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("align", sanlock.ALIGN_SIZE) >> def test_write_resource_4k(sanlock_daemon, user_4k_path, align): >> disks = [(user_4k_path, 0)] >> >> # Poison resource area, ensuring that previous tests will not break >> this >> @@ -248,11 +241,10 @@ def >> test_write_resource_4k_invalid_sector_size(sanlock_daemon, user_4k_path): >> sanlock.write_resource( >> b"ls_name", b"res_name", disks, sector=SECTOR_SIZE_512) >> assert e.value.errno == errno.EINVAL >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> def test_read_resource_4k_invalid_sector_size(sanlock_daemon, >> user_4k_path): >> disks = [(user_4k_path, 0)] >> >> sanlock.write_resource( >> b"ls_name", >> @@ -264,11 +256,10 @@ def >> test_read_resource_4k_invalid_sector_size(sanlock_daemon, user_4k_path): >> with pytest.raises(sanlock.SanlockException) as e: >> sanlock.read_resource(user_4k_path, sector=SECTOR_SIZE_512) >> assert e.value.errno == errno.EINVAL >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> def test_read_resource_owners_4k_invalid_sector_size( >> sanlock_daemon, user_4k_path): >> disks = [(user_4k_path, 0)] >> >> sanlock.write_resource( >> @@ -282,11 +273,10 @@ def >> test_read_resource_owners_4k_invalid_sector_size( >> sanlock.read_resource_owners( >> b"ls_name", b"res_name", disks, sector=SECTOR_SIZE_512) >> assert e.value.errno == errno.EINVAL >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> def test_read_resource_owners_invalid_align_size(tmpdir, sanlock_daemon): >> path = str(tmpdir.join("path")) >> util.create_file(path, GiB) >> disks = [(path, 0)] >> >> @@ -305,11 +295,10 @@ def >> test_read_resource_owners_invalid_align_size(tmpdir, sanlock_daemon): >> align=ALIGNMENT_2M, >> sector=SECTOR_SIZE_512) >> assert e.value.errno == errno.EINVAL >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("size,offset", [ >> # Smallest offset. >> (MIN_RES_SIZE, 0), >> # Large offset. >> (LARGE_FILE_SIZE, LARGE_FILE_SIZE - MIN_RES_SIZE), >> @@ -350,11 +339,10 @@ def test_add_rem_lockspace(tmpdir, sanlock_daemon, >> size, offset): >> >> lockspaces = sanlock.get_lockspaces() >> assert lockspaces == [] >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): >> path = str(tmpdir.join("ls_name")) >> util.create_file(path, MiB) >> >> sanlock.write_lockspace(b"ls_name", path, iotimeout=1) >> @@ -387,11 +375,10 @@ def test_add_rem_lockspace_async(tmpdir, >> sanlock_daemon): >> # Once the lockspace was released, we expect to get False. >> acquired = sanlock.inq_lockspace(b"ls_name", 1, path, wait=True) >> assert acquired is False >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("size,offset", [ >> # Smallest offset. >> (MIN_RES_SIZE, 0), >> # Large offset. >> (LARGE_FILE_SIZE, LARGE_FILE_SIZE - MIN_RES_SIZE), >> @@ -461,11 +448,10 @@ def test_acquire_release_resource(tmpdir, >> sanlock_daemon, size, offset): >> >> owners = sanlock.read_resource_owners(b"ls_name", b"res_name", disks) >> assert owners == [] >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("align, sector", [ >> # Invalid alignment >> (KiB, sanlock.SECTOR_SIZE[0]), >> # Invalid sector size >> (sanlock.ALIGN_SIZE[0], 8 * KiB), >> @@ -477,11 +463,10 @@ def test_write_lockspace_invalid_align_sector( >> >> with pytest.raises(ValueError): >> sanlock.write_lockspace(b"ls_name", path, align=align, >> sector=sector) >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("align, sector", [ >> # Invalid alignment >> (KiB, sanlock.SECTOR_SIZE[0]), >> # Invalid sector size >> (sanlock.ALIGN_SIZE[0], 8 * KiB), >> @@ -495,11 +480,10 @@ def test_write_resource_invalid_align_sector( >> with pytest.raises(ValueError): >> sanlock.write_resource( >> b"ls_name", b"res_name", disks, align=align, sector=sector) >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("disk", [ >> # Not a tuple - unicode and bytes: >> "not a tuple", >> b"not a tuple", >> u'\u05e9\u05dc\u05d5\u05dd', >> @@ -550,31 +534,28 @@ def >> test_add_lockspace_parse_args(no_sanlock_daemon, name): >> def test_write_lockspace_parse_args(no_sanlock_daemon, name): >> with raises_sanlock_errno(): >> sanlock.write_lockspace(name, "ls_path") >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> def test_write_resource_parse_args(no_sanlock_daemon, name): >> with raises_sanlock_errno(): >> sanlock.write_resource(name, b"res_name", [("disk_path",0)]) >> >> with raises_sanlock_errno(): >> sanlock.write_resource(b"ls_name", name, [("disk_path",0)]) >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> def test_release_resource_parse_args(no_sanlock_daemon, name): >> with raises_sanlock_errno(): >> sanlock.release(name, b"res_name", [("disk_path",0)]) >> >> with raises_sanlock_errno(): >> sanlock.release(b"ls_name", name, [("disk_path",0)]) >> >> >> -(a)pytest.mark.xfail(six.PY3, reason="lockspace/resource names in bytes >> are unsupported yet") >> @pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES) >> def test_read_resource_owners_parse_args(no_sanlock_daemon, name): >> with raises_sanlock_errno(): >> sanlock.read_resource_owners(name, b"res_name", >> [("disk_path",0)]) >> >> -- >> 2.17.2 >> >>

1 0

Re: [PATCH 14/18] python: Use PyBytes converter for read_resource_owners API
by Amit Bawer 10 Jun '19

10 Jun '19

that's why they are called redundant. nobody needs them. both pointer are initialized to NULL if not allocated, so call to free is safe by ISO-C standards. On Mon, Jun 10, 2019 at 5:29 PM Pavel Bar <pbar(a)redhat.com> wrote: > > > On Mon, Jun 3, 2019 at 11:31 PM Nir Soffer <nirsof(a)gmail.com> wrote: > >> From: Amit Bawer <abawer(a)redhat.com> >> >> Implications: >> >> - Py2 : no difference >> - Py3 : if used, only accept bytes for lockspace name. >> --- >> python/sanlock.c | 33 +++++++++++++++++++-------------- >> 1 file changed, 19 insertions(+), 14 deletions(-) >> >> diff --git a/python/sanlock.c b/python/sanlock.c >> index 0964671..ed9b4f0 100644 >> --- a/python/sanlock.c >> +++ b/python/sanlock.c >> @@ -1226,59 +1226,64 @@ Align can be one of (1048576, 2097152, 4194304, >> 8388608).\n\ >> Sector can be one of (512, 4096)."); >> >> static PyObject * >> py_read_resource_owners(PyObject *self __unused, PyObject *args, >> PyObject *keywds) >> { >> - int rv, hss_count = 0; >> + int rv = -1, hss_count = 0; >> int sector = SECTOR_SIZE_512; >> long align = ALIGNMENT_1M; >> - const char *lockspace, *resource; >> + PyObject *lockspace = NULL, *resource = NULL; >> struct sanlk_resource *res = NULL; >> struct sanlk_host *hss = NULL; >> PyObject *disks, *ls_list = NULL; >> >> static char *kwlist[] = {"lockspace", "resource", "disks", "align", >> "sector", NULL}; >> >> /* parse python tuple */ >> - if (!PyArg_ParseTupleAndKeywords(args, keywds, "ssO!|li", kwlist, >> - &lockspace, &resource, &PyList_Type, &disks, &align, &sector)) { >> - return NULL; >> + if (!PyArg_ParseTupleAndKeywords(args, keywds, "O&O&O!|li", kwlist, >> + convert_to_pybytes, &lockspace, convert_to_pybytes, &resource, >> + &PyList_Type, &disks, &align, &sector)) { >> + goto finally; >> } >> >> /* parse and check sanlock resource */ >> if (__parse_resource(disks, &res) < 0) { >> - return NULL; >> + goto finally; >> } >> >> /* prepare sanlock names */ >> - strncpy(res->lockspace_name, lockspace, SANLK_NAME_LEN); >> - strncpy(res->name, resource, SANLK_NAME_LEN); >> + strncpy(res->lockspace_name, PyBytes_AsString(lockspace), >> SANLK_NAME_LEN); >> + strncpy(res->name, PyBytes_AsString(resource), SANLK_NAME_LEN); >> >> /* set resource alignment and sector flags */ >> >> if (add_align_flag(align, &res->flags) == -1) >> - goto exit_fail; >> + goto finally; >> >> if (add_sector_flag(sector, &res->flags) == -1) >> - goto exit_fail; >> + goto finally; >> >> /* read resource owners (gil disabled) */ >> Py_BEGIN_ALLOW_THREADS >> rv = sanlock_read_resource_owners(res, 0, &hss, &hss_count); >> Py_END_ALLOW_THREADS >> >> if (rv != 0) { >> __set_exception(rv, "Unable to read resource owners"); >> - goto exit_fail; >> + goto finally; >> } >> >> ls_list = __hosts_to_list(hss, hss_count); >> >> -exit_fail: >> - if (res) free(res); >> - if (hss) free(hss); >> +finally: >> + Py_XDECREF(lockspace); >> + Py_XDECREF(resource); >> + free(res); >> + free(hss); >> + if (rv != 0) >> + return NULL; >> > > The above 2 lines (the "if" statement) are redundant, that's why they were > not in the original code. Although they do add for readability, so better > leave them. > > >> return ls_list; >> } >> >> /* killpath */ >> PyDoc_STRVAR(pydoc_killpath, "\ >> -- >> 2.17.2 >> >>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

sanlock-devel June 2019