April 2019 - sanlock-devel - Fedora mailing-lists

[PATCH v3 0/4] Values instead of flags in python API.
by Vojtech Juranek 01 May '19

01 May '19

To have more consisten python API, value should be used for secor size and alignment instead of flags. This patch set replaces flags with values in public API, expose tuples with supported sector size and alignment values and add some related tests. The third version of this patch set fixes mostly typos, formatting, use constants instead of raw values in tests and fixes other stuff which doesn't change the logic of original patch. Vojtech Juranek (4): tests: add sector and align parameters Accept values instead of flags for sector and aling parameters. Expose tuples with supported align and sector values tests: add tests for invalid align and sector values python/example.py | 4 +- python/sanlock.c | 168 +++++++++++++++++++++++++++++++++---------- tests/python_test.py | 55 ++++++++++++-- 3 files changed, 182 insertions(+), 45 deletions(-) -- 2.20.1

2 7

[PATCH 1/4] tests: add sector and align parameters
by Vojtech Juranek 01 May '19

01 May '19

Add sector and align parameters to read and write lockspace and resource calls to test_write_lockspace and test_write_resource tests to test that these parameters are accepted. Other tests still use calls without these parameters to test the defaults. --- tests/python_test.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/python_test.py b/tests/python_test.py index 5029924..6393222 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -34,9 +34,12 @@ def test_write_lockspace(tmpdir, sanlock_daemon, size, offset): path = str(tmpdir.join("lockspace")) util.create_file(path, size) - sanlock.write_lockspace("name", path, offset=offset, iotimeout=1) + sanlock.write_lockspace( + "name", path, offset=offset, iotimeout=1, align=sanlock.ALIGN1M, + sector=sanlock.SECTOR512) - ls = sanlock.read_lockspace(path, offset=offset) + ls = sanlock.read_lockspace( + path, offset=offset, align=sanlock.ALIGN1M, sector=sanlock.SECTOR512) assert ls == {"iotimeout": 1, "lockspace": "name"} acquired = sanlock.inq_lockspace( @@ -64,9 +67,12 @@ def test_write_resource(tmpdir, sanlock_daemon, size, offset): util.create_file(path, size) disks = [(path, offset)] - sanlock.write_resource("ls_name", "res_name", disks) + sanlock.write_resource( + "ls_name", "res_name", disks, align=sanlock.ALIGN1M, + sector=sanlock.SECTOR512) - res = sanlock.read_resource(path, offset=offset) + res = sanlock.read_resource( + path, offset=offset, align=sanlock.ALIGN1M, sector=sanlock.SECTOR512) assert res == { "lockspace": "ls_name", "resource": "res_name", -- 2.20.1

2 4

[PATCH v2 0/4] Values instead of flags in python API.
by Vojtech Juranek 26 Apr '19

26 Apr '19

To have more consisten python API, value should be used for secor size and alignment instead of flags. This patch set replaces flags with values in public API, expose tuples with supported sector size and alignment values and add some related tests. Second version of this patch set fixes pointer dereffeence in 3th patch. Vojtech Juranek (4): tests: add sector and align parameters Accept values instead of flags for sector and aling parameters. Expose tuples with supported align and sector values tests: add tests for invalid align and sector values python/example.py | 4 +- python/sanlock.c | 161 ++++++++++++++++++++++++++++++++++--------- tests/python_test.py | 48 +++++++++++-- 3 files changed, 173 insertions(+), 40 deletions(-) -- 2.20.1

2 5

Re: [PATCH 3/4] Expose tuples with supported align and sector values
by Vojtech Juranek 26 Apr '19

26 Apr '19

Hi, > Hi Vojtech > > Please see some questions in-lined below. > > Thanks > Amit > > On Thu, Apr 25, 2019 at 2:57 PM Vojtech Juranek <vjuranek(a)redhat.com> wrote: > > Previous patch switched from accepting align and sector flags to values. > > Exposing internal sanlock flags doesn't make sense now. Tuples with > > supported sector size and alignment values should be exposed instead. > > --- > > > > python/sanlock.c | 24 ++++++++++++++++-------- > > 1 file changed, 16 insertions(+), 8 deletions(-) > > > > diff --git a/python/sanlock.c b/python/sanlock.c > > index 323f1bd..f367fbd 100644 > > --- a/python/sanlock.c > > +++ b/python/sanlock.c > > @@ -1739,13 +1739,21 @@ initsanlock(void) > > > > PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_REPLACE_EVENT, > > > > "SETEV_REPLACE_EVENT"); > > > > PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_ALL_HOSTS, > > > > "SETEV_ALL_HOSTS"); > > > > - /* Sector and align size flags */ > > - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR512, "SECTOR512"); > > - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR4K, "SECTOR4K"); > > - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN1M, "ALIGN1M"); > > - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN2M, "ALIGN2M"); > > - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN4M, "ALIGN4M"); > > - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN8M, "ALIGN8M"); > > - > > > > #undef PYSNLK_INIT_ADD_CONSTANT > > > > + > > + /* Tuples with supported sector size and alignment values */ > > + PyObject *sector = PyTuple_New(2); > > + PyTuple_SetItem(sector, 0, PyInt_FromLong(SECTOR512)); > > + PyTuple_SetItem(sector, 1, PyInt_FromLong(SECTOR4K)); > > + if (PyModule_AddObject(py_module, "SECTOR", sector)) > > + Py_DECREF("SECTOR"); > > *shouldn't this be Py_DECREF(sector) ? AFAIK Py_DECREF should get a pointer > to PyObject * ops, sure, thanks for spotting it, same for align > > + > > + PyObject *align = PyTuple_New(4); > > + PyTuple_SetItem(align, 0, PyInt_FromLong(ALIGN1M)); > > + PyTuple_SetItem(align, 1, PyInt_FromLong(ALIGN2M)); > > + PyTuple_SetItem(align, 2, PyInt_FromLong(ALIGN4M)); > > + PyTuple_SetItem(align, 3, PyInt_FromLong(ALIGN8M)); > > + if (PyModule_AddObject(py_module, "ALIGN", align)) > > + Py_DECREF("ALIGN"); > > *shouldn't this be Py_DECREF(align) ? AFAIK Py_DECREF should get a pointer > to PyObject * > > > + > > > > } > > > > -- > > 2.20.1 > > *In What repo/branch are those patches available ? * official repo is [1], I pushed my changes into my fork on github [2], however, patches are handled over email on sanlock-devel ML [3], so you should CC also sanlock-devel(a)lists.fedorahosted.org (you have to subscribe to this ML first to be able to post there) [1] https://pagure.io/sanlock [2] https://github.com/vjuranek/sanlock/tree/4k_api_update [3] https://lists.fedorahosted.org/admin/lists/sanlock-devel.lists.fedorahosted…

1 0

[sanlock] 03/03: tests: Test reading and writing large offsets
by pagure＠pagure.io 22 Apr '19

22 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit d04760e01d22b8b06b017b3826a07e35f060da03 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 19 18:24:38 2019 +0300 tests: Test reading and writing large offsets The python module uses "k" format string[1] to convert lockspace offset and PyInt_AsLong[2] to convert disk offset. Both return long, while sanlock offset use uint64_t. This is not correct on all systems but I'm not sure we support any system when sizeof(long) < 8. Add tests for large offset exceeding LONG_MAX to check that current code actually works. Vdsm does not use such offset yet, but when using 4k sector size and 2 MiB alignment, vdsm will access such offset. Theoretically we can test up to (16 TiB - 1 MiB) offset, but testing show that practical maximum file size is about 15 TiB. To make the test less likely to fail on developer machine or CI slave, use 1 TiB file for testing large offset. [1] https://docs.python.org/2.7/c-api/arg.html (see k (integer) [unsigned long]) [2] https://docs.python.org/2.7/c-api/int.html#c.PyInt_AsLong Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/python_test.py | 91 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 27 deletions(-) diff --git a/tests/python_test.py b/tests/python_test.py index be1e3ab..5029924 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -14,21 +14,37 @@ import sanlock from . import constants from . import util - -def test_write_lockspace(tmpdir, sanlock_daemon): +# Largest file size on ext4 is 16TiB, and on xfs 500 TiB. Use 1 TiB as it is +# large enough to test large offsets, and less likely to fail on developer +# machine or CI slave. +# See https://access.redhat.com/articles/rhel-limits +LARGE_FILE_SIZE = 1024**4 + +LOCKSPACE_SIZE = 1024**2 +MIN_RES_SIZE = 1024**2 + + +(a)pytest.mark.parametrize("size,offset", [ + # Smallest offset. + (LOCKSPACE_SIZE, 0), + # Large offset. + (LARGE_FILE_SIZE, LARGE_FILE_SIZE - LOCKSPACE_SIZE), +]) +def test_write_lockspace(tmpdir, sanlock_daemon, size, offset): path = str(tmpdir.join("lockspace")) - size = 1024**2 util.create_file(path, size) - sanlock.write_lockspace("name", path, offset=0, iotimeout=1) + sanlock.write_lockspace("name", path, offset=offset, iotimeout=1) - ls = sanlock.read_lockspace(path, offset=0) + ls = sanlock.read_lockspace(path, offset=offset) assert ls == {"iotimeout": 1, "lockspace": "name"} - acquired = sanlock.inq_lockspace("name", 1, path, wait=False) + acquired = sanlock.inq_lockspace( + "name", 1, path, offset=offset, wait=False) assert acquired is False with io.open(path, "rb") as f: + f.seek(offset) magic, = struct.unpack("< I", f.read(4)) assert magic == constants.DELTA_DISK_MAGIC @@ -37,15 +53,20 @@ def test_write_lockspace(tmpdir, sanlock_daemon): util.check_guard(path, size) -def test_write_resource(tmpdir, sanlock_daemon): +(a)pytest.mark.parametrize("size,offset", [ + # Smallest offset. + (MIN_RES_SIZE, 0), + # Large offset. + (LARGE_FILE_SIZE, LARGE_FILE_SIZE - MIN_RES_SIZE), +]) +def test_write_resource(tmpdir, sanlock_daemon, size, offset): path = str(tmpdir.join("resources")) - size = 1024**2 util.create_file(path, size) - disks = [(path, 0)] + disks = [(path, offset)] sanlock.write_resource("ls_name", "res_name", disks) - res = sanlock.read_resource(path, 0) + res = sanlock.read_resource(path, offset=offset) assert res == { "lockspace": "ls_name", "resource": "res_name", @@ -56,6 +77,7 @@ def test_write_resource(tmpdir, sanlock_daemon): assert owners == [] with io.open(path, "rb") as f: + f.seek(offset) magic, = struct.unpack("< I", f.read(4)) assert magic == constants.PAXOS_DISK_MAGIC @@ -64,26 +86,35 @@ def test_write_resource(tmpdir, sanlock_daemon): util.check_guard(path, size) -def test_add_rem_lockspace(tmpdir, sanlock_daemon): +(a)pytest.mark.parametrize("size,offset", [ + # Smallest offset. + (MIN_RES_SIZE, 0), + # Large offset. + (LARGE_FILE_SIZE, LARGE_FILE_SIZE - MIN_RES_SIZE), +]) +def test_add_rem_lockspace(tmpdir, sanlock_daemon, size, offset): path = str(tmpdir.join("ls_name")) - util.create_file(path, 1024**2) + util.create_file(path, size) - sanlock.write_lockspace("ls_name", path, iotimeout=1) + sanlock.write_lockspace("ls_name", path, offset=offset, iotimeout=1) # Since the lockspace is not acquired, we exepect to get False. - acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + acquired = sanlock.inq_lockspace( + "ls_name", 1, path, offset=offset, wait=False) assert acquired is False - sanlock.add_lockspace("ls_name", 1, path, iotimeout=1) + sanlock.add_lockspace("ls_name", 1, path, offset=offset, iotimeout=1) # Once the lockspace is acquired, we exepect to get True. - acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + acquired = sanlock.inq_lockspace( + "ls_name", 1, path, offset=offset, wait=False) assert acquired is True - sanlock.rem_lockspace("ls_name", 1, path) + sanlock.rem_lockspace("ls_name", 1, path, offset=offset) # Once the lockspace is released, we exepect to get False. - acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + acquired = sanlock.inq_lockspace( + "ls_name", 1, path, offset=offset, wait=False) assert acquired is False @@ -123,15 +154,21 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): assert acquired is False -def test_acquire_release_resource(tmpdir, sanlock_daemon): +(a)pytest.mark.parametrize("size,offset", [ + # Smallest offset. + (MIN_RES_SIZE, 0), + # Large offset. + (LARGE_FILE_SIZE, LARGE_FILE_SIZE - MIN_RES_SIZE), +]) +def test_acquire_release_resource(tmpdir, sanlock_daemon, size, offset): ls_path = str(tmpdir.join("ls_name")) - util.create_file(ls_path, 1024**2) + util.create_file(ls_path, size) res_path = str(tmpdir.join("res_name")) - util.create_file(res_path, 1024**2) + util.create_file(res_path, size) - sanlock.write_lockspace("ls_name", ls_path, iotimeout=1) - sanlock.add_lockspace("ls_name", 1, ls_path, iotimeout=1) + sanlock.write_lockspace("ls_name", ls_path, offset=offset, iotimeout=1) + sanlock.add_lockspace("ls_name", 1, ls_path, offset=offset, iotimeout=1) # Host status is not available until the first renewal. with pytest.raises(sanlock.SanlockException) as e: @@ -142,10 +179,10 @@ def test_acquire_release_resource(tmpdir, sanlock_daemon): host = sanlock.get_hosts("ls_name", 1)[0] assert host["flags"] == sanlock.HOST_LIVE - disks = [(res_path, 0)] + disks = [(res_path, offset)] sanlock.write_resource("ls_name", "res_name", disks) - res = sanlock.read_resource(res_path, 0) + res = sanlock.read_resource(res_path, offset=offset) assert res == { "lockspace": "ls_name", "resource": "res_name", @@ -158,7 +195,7 @@ def test_acquire_release_resource(tmpdir, sanlock_daemon): fd = sanlock.register() sanlock.acquire("ls_name", "res_name", disks, slkfd=fd) - res = sanlock.read_resource(res_path, 0) + res = sanlock.read_resource(res_path, offset=offset) assert res == { "lockspace": "ls_name", "resource": "res_name", @@ -179,7 +216,7 @@ def test_acquire_release_resource(tmpdir, sanlock_daemon): sanlock.release("ls_name", "res_name", disks, slkfd=fd) - res = sanlock.read_resource(res_path, 0) + res = sanlock.read_resource(res_path, offset=offset) assert res == { "lockspace": "ls_name", "resource": "res_name", -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/03: tests: Remove unneeded str() conversion
by pagure＠pagure.io 22 Apr '19

22 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit f3382c495680ab1b27c5f7efbef2d6576d4d0ac3 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 19 18:24:37 2019 +0300 tests: Remove unneeded str() conversion Two instances were forgottern in the last cleanup, removing them. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/python_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/python_test.py b/tests/python_test.py index 2dd4e17..be1e3ab 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -28,13 +28,13 @@ def test_write_lockspace(tmpdir, sanlock_daemon): acquired = sanlock.inq_lockspace("name", 1, path, wait=False) assert acquired is False - with io.open(str(path), "rb") as f: + with io.open(path, "rb") as f: magic, = struct.unpack("< I", f.read(4)) assert magic == constants.DELTA_DISK_MAGIC # TODO: check more stuff here... - util.check_guard(str(path), size) + util.check_guard(path, size) def test_write_resource(tmpdir, sanlock_daemon): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/03: tests: Allow testing large files
by pagure＠pagure.io 22 Apr '19

22 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit 68b5d5cdb037299cd6d629bcf15867330f1d5093 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 19 18:24:36 2019 +0300 tests: Allow testing large files util.create_file() was filling the file with "x". This works for small files but prevent testing big files. Change to create sparse file so we can test easily large files and offsets. Tests that want to fill areas on storage can access the file directly. We don't have such tests yet. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/util.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/util.py b/tests/util.py index 2259473..a6b53e3 100644 --- a/tests/util.py +++ b/tests/util.py @@ -97,11 +97,9 @@ def wait_for_termination(p, timeout): time.sleep(0.05) -def create_file(path, size, poison=b"x", guard=b"X", guard_size=4096): +def create_file(path, size, guard=b"X", guard_size=4096): """ - Create file filled with poison byte. - - To create an empty file, set poison to None. + Create sparse file of size bytes. If guard is set, add a guard area after the end of the file and fill it with guard bytes. This allows testing that the code under test do not write @@ -109,11 +107,9 @@ def create_file(path, size, poison=b"x", guard=b"X", guard_size=4096): """ with io.open(path, "wb") as f: f.truncate(size) - if poison: - f.write(poison * size) if guard: f.seek(size) - f.write(guard * 4096) + f.write(guard * guard_size) def check_guard(path, size, guard=b"X", guard_size=4096): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH 0/3] Test large offset
by Nir Soffer 19 Apr '19

19 Apr '19

While working on python 3 port, we noticed that the python extension may truncate large offset when converting python value to C value. Change the tests to test also large offsets to make sure current code actually works with offset > LONG_MAX. Nir Soffer (3): tests: Allow testing large files tests: Remove unneeded str() conversion tests: Test reading and writing large offsets tests/python_test.py | 95 ++++++++++++++++++++++++++++++-------------- tests/util.py | 10 ++--- 2 files changed, 69 insertions(+), 36 deletions(-) -- 2.17.2

1 3

[PATCH] python: improve rem_lockspace API doc wording
by Vojtech Juranek 16 Apr '19

16 Apr '19

--- python/sanlock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/sanlock.c b/python/sanlock.c index b387307..3bfd1f2 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -746,8 +746,9 @@ 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\ 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 (instead of automatically\n\ -release it)."); +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) -- 2.20.1

1 0

Re: [PATCH] python: improve rem_lockspace API doc wording
by Nir Soffer 16 Apr '19

16 Apr '19

On Tue, Apr 16, 2019 at 10:37 PM Vojtech Juranek <vjuranek(a)redhat.com> wrote: > --- > python/sanlock.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/python/sanlock.c b/python/sanlock.c > index b387307..3bfd1f2 100644 > --- a/python/sanlock.c > +++ b/python/sanlock.c > @@ -746,8 +746,9 @@ 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\ > 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 (instead of > automatically\n\ > -release it)."); > +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."); > Looks good. Adding a note about the time this may block can be helpful, but this is probably true for other functions and we can improve it later. Nir > > static PyObject * > py_rem_lockspace(PyObject *self __unused, PyObject *args, PyObject > *keywds) > -- > 2.20.1 > > >

1 0

[sanlock] 03/03: spec: Keep sanlock-python on centos/rhel
by pagure＠pagure.io 15 Apr '19

15 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit 5992a89f2e538be3010e435994f37671861fddd3 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Sat Apr 13 18:32:36 2019 +0300 spec: Keep sanlock-python on centos/rhel On fedora we switched to python2-sanlock as part of python 3 porting but on rhel we still build the package as sanlock-python. Change the spec so we keep the name used by the distribution. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- sanlock.spec.in | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sanlock.spec.in b/sanlock.spec.in index 8bc80aa..c31599d 100644 --- a/sanlock.spec.in +++ b/sanlock.spec.in @@ -25,6 +25,15 @@ 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 + %description The sanlock daemon manages leases for applications on hosts using shared storage. @@ -127,21 +136,23 @@ access to the shared disks. %{_libdir}/libsanlock_client.so.* %{_libdir}/libwdmd.so.* -%package -n python2-sanlock -%{?python_provide:%python_provide python2-sanlock} +%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} -Summary: Python bindings for the sanlock library -Requires: %{name}-lib = %{version}-%{release} +%endif # fedora -%description -n python2-sanlock -The %{name}-python package contains a module that permits applications +%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 python2-sanlock +%files -n %{python_package} %{python2_sitearch}/sanlock_python-*.egg-info %{python2_sitearch}/sanlock.so -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/03: spec: Clean up the spec
by pagure＠pagure.io 15 Apr '19

15 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit e0ff0080409de79299b5b823c6b134601e03ca05 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Sat Apr 13 18:32:35 2019 +0300 spec: Clean up the spec - Add note about using this spec only for development - Remove irrelevant changelog entries. This spec started when we imported it from Fedora. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- sanlock.spec.in | 116 ++++++-------------------------------------------------- 1 file changed, 11 insertions(+), 105 deletions(-) diff --git a/sanlock.spec.in b/sanlock.spec.in index 0bd9e34..8bc80aa 100644 --- a/sanlock.spec.in +++ b/sanlock.spec.in @@ -1,3 +1,11 @@ +# NOTE: this spec should be used only for developmemnt. +# +# To find the real sanlock spec use: +# - Fedora: fedpkg clone sanlock +# - RHEL: rhpkg clone sanlock +# +# This spec was created from Fedora spec and modified to work on CentOS. + Name: sanlock Version: @VERSION@ Release: @RELEASE@%{?dist} @@ -178,108 +186,6 @@ common sanlock lockspace. %changelog -* Wed Mar 20 2019 Nir Soffer <nsoffer(a)redhat.com> - 3.7.0-1 -- remove unneeded with_systemd macro -- update to sanlock 3.7.0 - -* Sat Feb 2 2019 Nir Soffer <nsoffer(a)redhat.com> - 3.6.0-8 -- fix build on Fedora rawhide - -* Thu Jan 24 2019 David Teigland <teigland(a)redhat.com> - 3.6.0-7 -- lockfile ownership - -* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Apr 12 2018 Iryna Shcherbina <shcherbina.iryna(a)gmail.com> - 3.6.0-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Mar 14 2018 David Teigland <teigland(a)redhat.com> - 3.6.0-4 -- change makefile flags - -* Wed Mar 14 2018 David Teigland <teigland(a)redhat.com> - 3.6.0-3 -- rebuild with set_build_flags - -* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Dec 12 2017 David Teigland <teigland(a)redhat.com> - 3.6.0-1 -- Update to sanlock-3.6.0, drop fence_sanlock - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.5.0-6 -- Add Provides for the old name without %%_isa - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.5.0-5 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.5.0-4 -- Python 2 binary package renamed to python2-sanlock - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 01 2017 David Teigland <teigland(a)redhat.com> - 3.5.0-1 -- Update to sanlock-3.5.0 - -* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.4.0-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… - -* Fri Jun 10 2016 David Teigland <teigland(a)redhat.com> - 3.4.0-1 -- Update to sanlock-3.4.0 - -* Tue Feb 23 2016 David Teigland <teigland(a)redhat.com> - 3.3.0-2 -- remove exclusive arch - -* Mon Feb 22 2016 David Teigland <teigland(a)redhat.com> - 3.3.0-1 -- Update to sanlock-3.3.0 - -* Tue Dec 01 2015 David Teigland <teigland(a)redhat.com> - 3.2.4-2 -- wdmd: prevent probe while watchdog is used - -* Fri Jun 19 2015 David Teigland <teigland(a)redhat.com> - 3.2.4-1 -- Update to sanlock-3.2.4 - -* Fri May 22 2015 David Teigland <teigland(a)redhat.com> - 3.2.3-2 -- add pkgconfig files - -* Wed May 20 2015 David Teigland <teigland(a)redhat.com> - 3.2.3-1 -- Update to sanlock-3.2.3 - -* Thu Oct 30 2014 David Teigland <teigland(a)redhat.com> - 3.2.2-2 -- checksum endian fix - -* Mon Sep 29 2014 David Teigland <teigland(a)redhat.com> - 3.2.2-1 -- Update to sanlock-3.2.2 - -* Thu Aug 21 2014 David Teigland <teigland(a)redhat.com> - 3.2.1-1 -- Update to sanlock-3.2.1 - -* Mon Aug 18 2014 David Teigland <teigland(a)redhat.com> - 3.2.0-1 -- Update to sanlock-3.2.0 - -* Wed Jan 29 2014 David Teigland <teigland(a)redhat.com> - 3.1.0-2 -- version interface - -* Tue Jan 07 2014 David Teigland <teigland(a)redhat.com> - 3.1.0-1 -- Update to sanlock-3.1.0 - -* Fri Dec 27 2013 Daniel Mach <dmach(a)redhat.com> - 3.0.1-3 -- Mass rebuild 2013-12-27 - -* Thu Aug 01 2013 David Teigland <teigland(a)redhat.com> - 3.0.1-2 -- use /usr/lib instead of /lib - -* Wed Jul 31 2013 David Teigland <teigland(a)redhat.com> - 3.0.1-1 -- Update to sanlock-3.0.1 - -* Wed Jul 24 2013 David Teigland <teigland(a)redhat.com> - 3.0.0-1 -- Update to sanlock-3.0.0 - +* 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) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/03: travis: Remove GCC 8 requirement
by pagure＠pagure.io 15 Apr '19

15 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit eb37638d9f0446af882098921e2ffd7a72f6c7c7 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Sat Apr 13 16:07:39 2019 +0300 travis: Remove GCC 8 requirement Now that we have runtime check for -fstack-clash-protection we don't need GCC 8 and we can save the time to download and install it on every build, and simplify the build configuration. While removing gcc-8, switch the dependencies to declarative style using the apt addon. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- .travis.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37643f4..7c1749c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,17 +4,11 @@ python: 2.7 addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - - gcc-8 - -before_install: - - sudo apt-get -qq update - - sudo apt-get install -y make gcc libaio-dev libblkid-dev - -env: - - CC="gcc-8" + - gcc + - libaio-dev + - libblkid-dev + - make script: - make BUILDARGS="--build-lib=." -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH 0/2] Clean up development spec
by Nir Soffer 13 Apr '19

13 Apr '19

Make it clear that the spec should be used only for development, and point to the distribution spec. When building on centos/rhel, keep the python package as sanlock-python. Using python2-sanlock will break developer setup when trying to upgrade the distribution sanlock. Nir Soffer (2): spec: Clean up the spec spec: Keep sanlock-python on centos/rhel sanlock.spec.in | 141 ++++++++++-------------------------------------- 1 file changed, 29 insertions(+), 112 deletions(-) -- 2.17.2

1 2

[PATCH] travis: Remove GCC 8 requirement
by Nir Soffer 13 Apr '19

13 Apr '19

Now that we have runtime check for -fstack-clash-protection we don't need GCC 8 and we can save the time to download and install it on every build, and simplify the build configuration. While removing gcc-8, switch the dependencies to declarative style using the apt addon. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- .travis.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37643f4..7c1749c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,15 @@ dist: xenial language: python python: 2.7 addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - - gcc-8 - -before_install: - - sudo apt-get -qq update - - sudo apt-get install -y make gcc libaio-dev libblkid-dev - -env: - - CC="gcc-8" + - gcc + - libaio-dev + - libblkid-dev + - make script: - make BUILDARGS="--build-lib=." - source tests/env.sh - pytest -- 2.17.2

1 0

[sanlock] 04/04: tests: Improve write_{lockspace,resource} tests
by pagure＠pagure.io 12 Apr '19

12 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit 253876ac9b54ddf793ccb6973e5eb42711077a2c Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 12 20:27:15 2019 +0300 tests: Improve write_{lockspace,resource} tests Use read_resource, read_resource_owners, read_lockspace, and inq_lockspace to verify creation of lockspace and resource. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/python_test.py | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/tests/python_test.py b/tests/python_test.py index 306d3c8..2dd4e17 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -16,11 +16,17 @@ from . import util def test_write_lockspace(tmpdir, sanlock_daemon): - path = tmpdir.join("lockspace") + path = str(tmpdir.join("lockspace")) size = 1024**2 - util.create_file(str(path), size) + util.create_file(path, size) - sanlock.write_lockspace("name", str(path), offset=0) + sanlock.write_lockspace("name", path, offset=0, iotimeout=1) + + ls = sanlock.read_lockspace(path, offset=0) + assert ls == {"iotimeout": 1, "lockspace": "name"} + + acquired = sanlock.inq_lockspace("name", 1, path, wait=False) + assert acquired is False with io.open(str(path), "rb") as f: magic, = struct.unpack("< I", f.read(4)) @@ -32,19 +38,30 @@ def test_write_lockspace(tmpdir, sanlock_daemon): def test_write_resource(tmpdir, sanlock_daemon): - path = tmpdir.join("resources") + path = str(tmpdir.join("resources")) size = 1024**2 - util.create_file(str(path), size) + util.create_file(path, size) + disks = [(path, 0)] - sanlock.write_resource("ls_name", "res_name", [(str(path), 0)]) + sanlock.write_resource("ls_name", "res_name", disks) - with io.open(str(path), "rb") as f: + res = sanlock.read_resource(path, 0) + assert res == { + "lockspace": "ls_name", + "resource": "res_name", + "version": 0 + } + + owners = sanlock.read_resource_owners("ls_name", "res_name", disks) + assert owners == [] + + with io.open(path, "rb") as f: magic, = struct.unpack("< I", f.read(4)) assert magic == constants.PAXOS_DISK_MAGIC # TODO: check more stuff here... - util.check_guard(str(path), size) + util.check_guard(path, size) def test_add_rem_lockspace(tmpdir, sanlock_daemon): -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 03/04: tests: Test acquire() and release()
by pagure＠pagure.io 12 Apr '19

12 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit bad156ca468873ccedb13e56c54635f492b39819 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 12 20:27:14 2019 +0300 tests: Test acquire() and release() Test acquiring and releasing a resource, and querying resource and host status. Since the new test uses read_resource_owners, we don't need the separate test for read_resource_owner. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/python_test.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 7 deletions(-) diff --git a/tests/python_test.py b/tests/python_test.py index bd9be65..306d3c8 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -2,10 +2,13 @@ Test sanlock python binding with sanlock daemon. """ +import errno import io import struct import time +import pytest + import sanlock from . import constants @@ -103,12 +106,68 @@ def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): assert acquired is False -def test_read_resource_owners(tmpdir, sanlock_daemon): - path = tmpdir.join("resources") - size = 1024**2 - util.create_file(str(path), size) - disks = [(str(path), 0)] +def test_acquire_release_resource(tmpdir, sanlock_daemon): + ls_path = str(tmpdir.join("ls_name")) + util.create_file(ls_path, 1024**2) + + res_path = str(tmpdir.join("res_name")) + util.create_file(res_path, 1024**2) + + sanlock.write_lockspace("ls_name", ls_path, iotimeout=1) + sanlock.add_lockspace("ls_name", 1, ls_path, iotimeout=1) + + # Host status is not available until the first renewal. + with pytest.raises(sanlock.SanlockException) as e: + sanlock.get_hosts("ls_name", 1) + assert e.value.errno == errno.EAGAIN + + time.sleep(1) + host = sanlock.get_hosts("ls_name", 1)[0] + assert host["flags"] == sanlock.HOST_LIVE + + disks = [(res_path, 0)] sanlock.write_resource("ls_name", "res_name", disks) - res = sanlock.read_resource_owners("ls_name", "res_name", disks) - assert res == [] + res = sanlock.read_resource(res_path, 0) + assert res == { + "lockspace": "ls_name", + "resource": "res_name", + "version": 0 + } + + owners = sanlock.read_resource_owners("ls_name", "res_name", disks) + assert owners == [] + + fd = sanlock.register() + sanlock.acquire("ls_name", "res_name", disks, slkfd=fd) + + res = sanlock.read_resource(res_path, 0) + assert res == { + "lockspace": "ls_name", + "resource": "res_name", + "version": 1 + } + + owner = sanlock.read_resource_owners("ls_name", "res_name", disks)[0] + + assert owner["host_id"] == 1 + assert owner["flags"] == 0 + assert owner["generation"] == 1 + assert owner["io_timeout"] == 0 # Why 0? + # TODO: check timestamp. + + host = sanlock.get_hosts("ls_name", 1)[0] + assert host["flags"] == sanlock.HOST_LIVE + assert host["generation"] == owner["generation"] + + sanlock.release("ls_name", "res_name", disks, slkfd=fd) + + res = sanlock.read_resource(res_path, 0) + assert res == { + "lockspace": "ls_name", + "resource": "res_name", + "version": 1 + } + + owners = sanlock.read_resource_owners("ls_name", "res_name", disks) + assert owners == [] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/04: tests: Test add_lockspace() and rem_lockspace()
by pagure＠pagure.io 12 Apr '19

12 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit ae674073be963baaf9bf1f2d37d76bff90545b3a Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 12 20:27:13 2019 +0300 tests: Test add_lockspace() and rem_lockspace() Add tests for add_lockspace() and rem_lockspace() using the python bindings. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/python_test.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/tests/python_test.py b/tests/python_test.py index 504503e..bd9be65 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -4,6 +4,7 @@ Test sanlock python binding with sanlock daemon. import io import struct +import time import sanlock @@ -43,6 +44,65 @@ def test_write_resource(tmpdir, sanlock_daemon): util.check_guard(str(path), size) +def test_add_rem_lockspace(tmpdir, sanlock_daemon): + path = str(tmpdir.join("ls_name")) + util.create_file(path, 1024**2) + + sanlock.write_lockspace("ls_name", path, iotimeout=1) + + # Since the lockspace is not acquired, we exepect to get False. + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + assert acquired is False + + sanlock.add_lockspace("ls_name", 1, path, iotimeout=1) + + # Once the lockspace is acquired, we exepect to get True. + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + assert acquired is True + + sanlock.rem_lockspace("ls_name", 1, path) + + # Once the lockspace is released, we exepect to get False. + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + assert acquired is False + + +def test_add_rem_lockspace_async(tmpdir, sanlock_daemon): + path = str(tmpdir.join("ls_name")) + util.create_file(path, 1024**2) + + sanlock.write_lockspace("ls_name", path, iotimeout=1) + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + assert acquired is False + + # This will take 3 seconds. + sanlock.add_lockspace("ls_name", 1, path, iotimeout=1, **{"async": True}) + + # While the lockspace is being aquired, we expect to get None. + time.sleep(1) + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + assert acquired is None + + # Once the lockspace is acquired, we exepect to get True. + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=True) + assert acquired is True + + # This will take about 3 seconds. + sanlock.rem_lockspace("ls_name", 1, path, **{"async": True}) + + # Wait until the lockspace change state from True to None. + while sanlock.inq_lockspace("ls_name", 1, path, wait=False): + time.sleep(1) + + # While the lockspace is being released, we expect to get None. + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=False) + assert acquired is None + + # Once the lockspace was released, we expect to get False. + acquired = sanlock.inq_lockspace("ls_name", 1, path, wait=True) + assert acquired is False + + def test_read_resource_owners(tmpdir, sanlock_daemon): path = tmpdir.join("resources") size = 1024**2 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/04: tests: Fix test name
by pagure＠pagure.io 12 Apr '19

12 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit e6a62ffdc9ea55002d769cdb3c8dc2e9cf27fbba Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 12 20:27:12 2019 +0300 tests: Fix test name Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tests/python_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python_test.py b/tests/python_test.py index 9cd6355..504503e 100644 --- a/tests/python_test.py +++ b/tests/python_test.py @@ -27,7 +27,7 @@ def test_write_lockspace(tmpdir, sanlock_daemon): util.check_guard(str(path), size) -def test_init_resource(tmpdir, sanlock_daemon): +def test_write_resource(tmpdir, sanlock_daemon): path = tmpdir.join("resources") size = 1024**2 util.create_file(str(path), size) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH 0/4] Complete python bindings tests
by Nir Soffer 12 Apr '19

12 Apr '19

Add missing tests and improve existing python binding tests, coverting all positive flows used by oVirt. - Test add_lockspace and rem_lockspace - Test acquire and release - Test read_resource, read_resource_owners, read_lockspace, inq_lockspace - Fix bad test name We probbaly need more tests to cover negative flows. These tests will help to port the bindings to python 3. Nir Soffer (4): tests: Fix test name tests: Test add_lockspace() and rem_lockspace() tests: Test acquire() and release() tests: Improve write_{lockspace,resource} tests tests/python_test.py | 168 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 152 insertions(+), 16 deletions(-) -- 2.17.2

1 4

[sanlock] 02/02: python: Clean up alignment and sector constants
by pagure＠pagure.io 12 Apr '19

12 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit af126ed0c3d0088344727eb36107c8807aca2129 Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 12 05:02:50 2019 +0300 python: Clean up alignment and sector constants The constants used SANLK_RES_ prefix, which is not needed, confusing, and make client code uglier. - SANLK_ prefix is not needed since all the constants are in the sanlock module namespace (e.g sanlock.ALIGN1M). - RES_ prefix is incorrect because the alignment and sector size are used for lockspace, rindex and resources. The help for the python functions mentioned the C API constants names (e.g. SANLK_LSF_ALIGN1M). Now we mention the python constant name (e.g ALIGN1M) which is the value the user of this module must use. Since this version was not released yet, we still have time to fix this API. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/example.py | 4 ++-- python/sanlock.c | 26 ++++++++++++-------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/python/example.py b/python/example.py index c0adf54..4fe845d 100644 --- a/python/example.py +++ b/python/example.py @@ -29,10 +29,10 @@ def main(): fd = sanlock.register() print "Initializing '%s'" % (LOCKSPACE_NAME,) - sanlock.write_lockspace(LOCKSPACE_NAME, disk, max_hosts=0, iotimeout=0, align=sanlock.SANLK_RES_ALIGN1M, sector=sanlock.SANLK_RES_SECTOR512) + sanlock.write_lockspace(LOCKSPACE_NAME, disk, max_hosts=0, iotimeout=0, align=sanlock.ALIGN1M, sector=sanlock.SECTOR512) print "Initializing '%s' on '%s'" % (RESOURCE_NAME, LOCKSPACE_NAME) - sanlock.write_resource(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=sanlock.SANLK_RES_ALIGN1M, sector=sanlock.SANLK_RES_SECTOR512) + sanlock.write_resource(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=sanlock.ALIGN1M, sector=sanlock.SECTOR512) print "Acquiring the id '%i' on '%s'" % (HOST_ID, LOCKSPACE_NAME) sanlock.add_lockspace(LOCKSPACE_NAME, HOST_ID, disk) diff --git a/python/sanlock.c b/python/sanlock.c index 5ddb6d4..b387307 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -361,7 +361,7 @@ exit_fail: /* write_lockspace */ PyDoc_STRVAR(pydoc_write_lockspace, "\ write_lockspace(lockspace, path, offset=0, max_hosts=0, iotimeout=0, \ -align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512)\n\ +align=ALIGN1M, sector=SECTOR512)\n\ Initialize or update a device to be used as sanlock lockspace."); static PyObject * @@ -409,8 +409,7 @@ py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) /* read_lockspace */ PyDoc_STRVAR(pydoc_read_lockspace, "\ -read_lockspace(path, offset=0 \ -align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512)\n -> dict\n\ +read_lockspace(path, offset=0, align=ALIGN1M, sector=SECTOR512)\n -> dict\n\ Read the lockspace information from a device at a specific offset."); static PyObject * @@ -482,15 +481,14 @@ exit_fail: /* read_resource */ PyDoc_STRVAR(pydoc_read_resource, "\ -read_resource(path, offset=0, \ -align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512) -> dict\n\ +read_resource(path, offset=0, align=ALIGN1M, sector=SECTOR512) -> dict\n\ Read the resource information from a device at a specific offset."); static PyObject * py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv, rs_len; - uint32_t align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512; + uint32_t align=SANLK_RES_ALIGN1M, sector=SANLK_RES_SECTOR512; const char *path; struct sanlk_resource *rs; PyObject *rs_info = NULL, *rs_entry = NULL; @@ -575,7 +573,7 @@ exit_fail: /* write_resource */ PyDoc_STRVAR(pydoc_write_resource, "\ write_resource(lockspace, resource, disks, max_hosts=0, num_hosts=0, \ -clear=False, align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512)\n\ +clear=False, align=ALIGN1M, sector=SECTOR512)\n\ Initialize a device to be used as sanlock resource.\n\ The disks must be in the format: [(path, offset), ... ].\n\ If clear is True, the resource is cleared so subsequent read will\n\ @@ -585,7 +583,7 @@ static PyObject * py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv, max_hosts = 0, num_hosts = 0, clear = 0; - uint32_t align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512; + uint32_t align=SANLK_RES_ALIGN1M, sector=SANLK_RES_SECTOR512; const char *lockspace, *resource; struct sanlk_resource *rs; PyObject *disks; @@ -1656,12 +1654,12 @@ initsanlock(void) PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_ALL_HOSTS, "SETEV_ALL_HOSTS"); /* Sector and align size flags */ - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR512, "SANLK_RES_SECTOR512"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR4K, "SANLK_RES_SECTOR4K"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN1M, "SANLK_RES_ALIGN1M"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN2M, "SANLK_RES_ALIGN2M"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN4M, "SANLK_RES_ALIGN4M"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN8M, "SANLK_RES_ALIGN8M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR512, "SECTOR512"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR4K, "SECTOR4K"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN1M, "ALIGN1M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN2M, "ALIGN2M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN4M, "ALIGN4M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN8M, "ALIGN8M"); #undef PYSNLK_INIT_ADD_CONSTANT } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/02: python: Unify python extension make command
by pagure＠pagure.io 12 Apr '19

12 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit e2ff29e3e2a8a036d0d99242af2af23bb1eee19a Author: Nir Soffer <nirsof(a)gmail.com> AuthorDate: Fri Apr 12 20:04:17 2019 +0300 python: Unify python extension make command Replace the python Makefile inplace target with environment variable, fixing the tests after the top Makefile was simplified to use: $(SUBDIRS): $(MAKE) -C $@ When running tox, we build sanlock extension inside the tox relevant tox environment (e.g. .tox/py27/...). This will be helpful for supporting python 3. On Travis we still build in the python directory - sanlock import fails if we build it elsewhere. This is not an issue for python 3 since on Travis we have separate build for every python version. Fixes: 6133e3471ca3 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- .travis.yml | 5 ++--- python/Makefile | 5 +---- tox.ini | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cc2859..37643f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ dist: xenial language: python +python: 2.7 addons: apt: @@ -16,8 +17,6 @@ env: - CC="gcc-8" script: - - make -C wdmd - - make -C src - - make -C python inplace + - make BUILDARGS="--build-lib=." - source tests/env.sh - pytest diff --git a/python/Makefile b/python/Makefile index 06c2201..c97e45a 100644 --- a/python/Makefile +++ b/python/Makefile @@ -5,10 +5,7 @@ # of the GNU General Public License v.2. all: - python2 setup.py build - -inplace: - python2 setup.py build_ext --inplace + python2 setup.py build $(BUILDARGS) install: python2 setup.py install --root=$(DESTDIR) diff --git a/tox.ini b/tox.ini index f65f487..1c2349e 100644 --- a/tox.ini +++ b/tox.ini @@ -14,13 +14,11 @@ setenv = LD_LIBRARY_PATH={env:PWD}/wdmd:{env:PWD}/src SANLOCK_PRIVILEGED=0 SANLOCK_RUN_DIR=/tmp/sanlock - PYTHONPATH={env:PWD}/python -sitepackages = True whitelist_externals = make deps = pytest==4.0 commands = - make + make BUILDARGS="--build-lib={envsitepackagesdir}" pytest {posargs} [pytest] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH v2] python: Unify python extension make command
by Nir Soffer 12 Apr '19

12 Apr '19

Replace the python Makefile inplace target with environment variable, fixing the tests after the top Makefile was simplified to use: $(SUBDIRS): $(MAKE) -C $@ When running tox, we build sanlock extension inside the tox relevant tox environment (e.g. .tox/py27/...). This will be helpful for supporting python 3. On Travis we still build in the python directory - sanlock import fails if we build it elsewhere. This is not an issue for python 3 since on Travis we have separate build for every python version. Fixes: 6133e3471ca3 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- .travis.yml | 5 ++--- python/Makefile | 5 +---- tox.ini | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cc2859..37643f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ dist: xenial language: python +python: 2.7 addons: apt: sources: - ubuntu-toolchain-r-test @@ -14,10 +15,8 @@ before_install: env: - CC="gcc-8" script: - - make -C wdmd - - make -C src - - make -C python inplace + - make BUILDARGS="--build-lib=." - source tests/env.sh - pytest diff --git a/python/Makefile b/python/Makefile index 06c2201..c97e45a 100644 --- a/python/Makefile +++ b/python/Makefile @@ -3,14 +3,11 @@ # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions # of the GNU General Public License v.2. all: - python2 setup.py build - -inplace: - python2 setup.py build_ext --inplace + python2 setup.py build $(BUILDARGS) install: python2 setup.py install --root=$(DESTDIR) clean: diff --git a/tox.ini b/tox.ini index f65f487..1c2349e 100644 --- a/tox.ini +++ b/tox.ini @@ -12,17 +12,15 @@ skip_missing_interpreters = True passenv = USER setenv = LD_LIBRARY_PATH={env:PWD}/wdmd:{env:PWD}/src SANLOCK_PRIVILEGED=0 SANLOCK_RUN_DIR=/tmp/sanlock - PYTHONPATH={env:PWD}/python -sitepackages = True whitelist_externals = make deps = pytest==4.0 commands = - make + make BUILDARGS="--build-lib={envsitepackagesdir}" pytest {posargs} [pytest] # Notes: # --basetemp: we must use /var/tmp as sanlock uses direct I/O. -- 2.17.2

1 0

[PATCH] python: Clean up alignment and sector constants
by Nir Soffer 11 Apr '19

11 Apr '19

The constants used SANLK_RES_ prefix, which is not needed, confusing, and make client code uglier. - SANLK_ prefix is not needed since all the constants are in the sanlock module namespace (e.g sanlock.ALIGN1M). - RES_ prefix is incorrect because the alignment and sector size are used for lockspace, rindex and resources. The help for the python functions mentioned the C API constants names (e.g. SANLK_LSF_ALIGN1M). Now we mention the python constant name (e.g ALIGN1M) which is the value the user of this module must use. Since this version was not released yet, we still have time to fix this API. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- python/example.py | 4 ++-- python/sanlock.c | 26 ++++++++++++-------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/python/example.py b/python/example.py index c0adf54..4fe845d 100644 --- a/python/example.py +++ b/python/example.py @@ -27,14 +27,14 @@ def main(): print "Registering to sanlock" fd = sanlock.register() print "Initializing '%s'" % (LOCKSPACE_NAME,) - sanlock.write_lockspace(LOCKSPACE_NAME, disk, max_hosts=0, iotimeout=0, align=sanlock.SANLK_RES_ALIGN1M, sector=sanlock.SANLK_RES_SECTOR512) + sanlock.write_lockspace(LOCKSPACE_NAME, disk, max_hosts=0, iotimeout=0, align=sanlock.ALIGN1M, sector=sanlock.SECTOR512) print "Initializing '%s' on '%s'" % (RESOURCE_NAME, LOCKSPACE_NAME) - sanlock.write_resource(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=sanlock.SANLK_RES_ALIGN1M, sector=sanlock.SANLK_RES_SECTOR512) + sanlock.write_resource(LOCKSPACE_NAME, RESOURCE_NAME, SNLK_DISKS, align=sanlock.ALIGN1M, sector=sanlock.SECTOR512) print "Acquiring the id '%i' on '%s'" % (HOST_ID, LOCKSPACE_NAME) sanlock.add_lockspace(LOCKSPACE_NAME, HOST_ID, disk) try: diff --git a/python/sanlock.c b/python/sanlock.c index 5ddb6d4..b387307 100644 --- a/python/sanlock.c +++ b/python/sanlock.c @@ -359,11 +359,11 @@ exit_fail: } /* write_lockspace */ PyDoc_STRVAR(pydoc_write_lockspace, "\ write_lockspace(lockspace, path, offset=0, max_hosts=0, iotimeout=0, \ -align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512)\n\ +align=ALIGN1M, sector=SECTOR512)\n\ Initialize or update a device to be used as sanlock lockspace."); static PyObject * py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { @@ -407,12 +407,11 @@ py_write_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) Py_RETURN_NONE; } /* read_lockspace */ PyDoc_STRVAR(pydoc_read_lockspace, "\ -read_lockspace(path, offset=0 \ -align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512)\n -> dict\n\ +read_lockspace(path, offset=0, align=ALIGN1M, sector=SECTOR512)\n -> dict\n\ Read the lockspace information from a device at a specific offset."); static PyObject * py_read_lockspace(PyObject *self __unused, PyObject *args, PyObject *keywds) { @@ -480,19 +479,18 @@ exit_fail: return NULL; } /* read_resource */ PyDoc_STRVAR(pydoc_read_resource, "\ -read_resource(path, offset=0, \ -align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512) -> dict\n\ +read_resource(path, offset=0, align=ALIGN1M, sector=SECTOR512) -> dict\n\ Read the resource information from a device at a specific offset."); static PyObject * py_read_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv, rs_len; - uint32_t align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512; + uint32_t align=SANLK_RES_ALIGN1M, sector=SANLK_RES_SECTOR512; const char *path; struct sanlk_resource *rs; PyObject *rs_info = NULL, *rs_entry = NULL; static char *kwlist[] = {"path", "offset", "align", "sector", NULL}; @@ -573,21 +571,21 @@ exit_fail: } /* write_resource */ PyDoc_STRVAR(pydoc_write_resource, "\ write_resource(lockspace, resource, disks, max_hosts=0, num_hosts=0, \ -clear=False, align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512)\n\ +clear=False, align=ALIGN1M, sector=SECTOR512)\n\ Initialize a device to be used as sanlock resource.\n\ The disks must be in the format: [(path, offset), ... ].\n\ If clear is True, the resource is cleared so subsequent read will\n\ return an error."); static PyObject * py_write_resource(PyObject *self __unused, PyObject *args, PyObject *keywds) { int rv, max_hosts = 0, num_hosts = 0, clear = 0; - uint32_t align=SANLK_LSF_ALIGN1M, sector=SANLK_LSF_SECTOR512; + uint32_t align=SANLK_RES_ALIGN1M, sector=SANLK_RES_SECTOR512; const char *lockspace, *resource; struct sanlk_resource *rs; PyObject *disks; uint32_t flags = 0; @@ -1654,14 +1652,14 @@ initsanlock(void) PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_CLEAR_EVENT, "SETEV_CLEAR_EVENT"); PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_REPLACE_EVENT, "SETEV_REPLACE_EVENT"); PYSNLK_INIT_ADD_CONSTANT(SANLK_SETEV_ALL_HOSTS, "SETEV_ALL_HOSTS"); /* Sector and align size flags */ - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR512, "SANLK_RES_SECTOR512"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR4K, "SANLK_RES_SECTOR4K"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN1M, "SANLK_RES_ALIGN1M"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN2M, "SANLK_RES_ALIGN2M"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN4M, "SANLK_RES_ALIGN4M"); - PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN8M, "SANLK_RES_ALIGN8M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR512, "SECTOR512"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_SECTOR4K, "SECTOR4K"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN1M, "ALIGN1M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN2M, "ALIGN2M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN4M, "ALIGN4M"); + PYSNLK_INIT_ADD_CONSTANT(SANLK_RES_ALIGN8M, "ALIGN8M"); #undef PYSNLK_INIT_ADD_CONSTANT } -- 2.17.2

1 0

[PATCH] makefiles: factor out common.mk
by Nir Soffer 10 Apr '19

10 Apr '19

From: Michael Shigorin <mike(a)altlinux.org> This commit started with adding the test for checking for -fstack-clash-protection before use (not available before gcc8, added with 0533006b4d36e8699ea51036d8914c22e46fae3f unconditionally); should help cases like the one mentioned in commit a904a3de2997bc7ce55b6cb3647d5ec347f0a2fa as well as myself with lcc/e2k. The CFLAGS specification and handling duplication didn't look all that well so I chose to reimplement the whole set of Makefiles into a proper recursive form with a shared one to include; should be easier to maintain overall. Signed-off-by: Michael Shigorin <mike(a)altlinux.org> Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> Tested-by: Nir Soffer <nsoffer(a)redhat.com> --- I rebased and tested on top of: https://github.com/nirs/sanlock/commit/bb0211a8a0cff302b09a5b419f30594d4988… Makefile | 26 +++++++++++++++++--------- common.mk | 31 +++++++++++++++++++++++++++++++ reset/Makefile | 29 ++--------------------------- src/Makefile | 29 ++--------------------------- wdmd/Makefile | 29 ++--------------------------- 5 files changed, 54 insertions(+), 90 deletions(-) create mode 100644 common.mk diff --git a/Makefile b/Makefile index 8b41526..36587e0 100644 --- a/Makefile +++ b/Makefile @@ -8,19 +8,27 @@ release := 0 endif distname := sanlock-$(version) tarball := $(distname).tar.gz -all: - $(MAKE) -C wdmd - $(MAKE) -C src - $(MAKE) -C python - -clean: - $(MAKE) -C wdmd clean - $(MAKE) -C src clean - $(MAKE) -C python clean +SUBDIRS = wdmd src python reset + +.PHONY: all $(SUBDIRS) clean install + +all: $(SUBDIRS) + +$(SUBDIRS): + $(MAKE) -C $@ + +src: wdmd + +python reset: src + +clean install: + for dir in $(SUBDIRS); do \ + $(MAKE) -C $$dir $@; \ + done dist: spec rm -f $(tarball) git archive --prefix=$(distname)/ HEAD > $(distname).tar tar rf $(distname).tar --transform="s|^|$(distname)/&|" sanlock.spec diff --git a/common.mk b/common.mk new file mode 100644 index 0000000..3221393 --- /dev/null +++ b/common.mk @@ -0,0 +1,31 @@ +export CC ?= cc + +check = $(shell echo "int main() { return 0; }" \ + | $(CC) $(1) -xc - >&/dev/null && echo $(1) ||:) + +export CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -Wall \ + -Wformat \ + -Wformat-security \ + -Wmissing-prototypes \ + -Wnested-externs \ + -Wpointer-arith \ + -Wextra \ + -Wshadow \ + -Wcast-align \ + -Wwrite-strings \ + -Waggregate-return \ + -Wstrict-prototypes \ + -Winline \ + -Wredundant-decls \ + -Wno-sign-compare \ + -Wno-unused-parameter \ + -Wp,-D_FORTIFY_SOURCE=2 \ + -Wno-strict-overflow \ + -fexceptions \ + -fasynchronous-unwind-tables \ + -fdiagnostics-show-option \ + -Wp,-D_GLIBCXX_ASSERTIONS \ + -fstack-protector-strong \ + $(check -fstack-clash-protection) \ + -Wl,-z,now diff --git a/reset/Makefile b/reset/Makefile index 5f5c425..004dbb6 100644 --- a/reset/Makefile +++ b/reset/Makefile @@ -1,38 +1,13 @@ +include ../common.mk + TARGET1 = sanlk-resetd TARGET2 = sanlk-reset SOURCE1 = sanlk_resetd.c SOURCE2 = sanlk_reset.c -CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - -Wall \ - -Wformat \ - -Wformat-security \ - -Wmissing-prototypes \ - -Wnested-externs \ - -Wpointer-arith \ - -Wextra \ - -Wshadow \ - -Wcast-align \ - -Wwrite-strings \ - -Waggregate-return \ - -Wstrict-prototypes \ - -Winline \ - -Wredundant-decls \ - -Wno-sign-compare \ - -Wno-unused-parameter \ - -Wp,-D_FORTIFY_SOURCE=2 \ - -Wno-strict-overflow \ - -fexceptions \ - -fasynchronous-unwind-tables \ - -fdiagnostics-show-option \ - -Wp,-D_GLIBCXX_ASSERTIONS \ - -fstack-protector-strong \ - -fstack-clash-protection \ - -Wl,-z,now - VER=$(shell cat ../VERSION) CFLAGS += -DVERSION=\"$(VER)\" -I../src -I../wdmd CFLAGS += -fPIE -DPIE diff --git a/src/Makefile b/src/Makefile index 623ea3a..533dd79 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,10 +2,12 @@ # # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions # of the GNU General Public License v2 or (at your option) any later version. +include ../common.mk + CMD_TARGET = sanlock HEADER_TARGET = sanlock.h sanlock_rv.h sanlock_resource.h sanlock_admin.h sanlock_direct.h MAN_TARGET = sanlock.8 SOMAJOR=1 @@ -65,37 +67,10 @@ LIB_CLIENT_SOURCE = \ env.c LIBPC_ENTIRE_SOURCE = libsanlock.pc.in LIBPC_CLIENT_SOURCE = libsanlock_client.pc.in -CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - -Wall \ - -Wformat \ - -Wformat-security \ - -Wmissing-prototypes \ - -Wnested-externs \ - -Wpointer-arith \ - -Wextra \ - -Wshadow \ - -Wcast-align \ - -Wwrite-strings \ - -Waggregate-return \ - -Wstrict-prototypes \ - -Winline \ - -Wredundant-decls \ - -Wno-sign-compare \ - -Wno-unused-parameter \ - -Wp,-D_FORTIFY_SOURCE=2 \ - -Wno-strict-overflow \ - -fexceptions \ - -fasynchronous-unwind-tables \ - -fdiagnostics-show-option \ - -Wp,-D_GLIBCXX_ASSERTIONS \ - -fstack-protector-strong \ - -fstack-clash-protection \ - -Wl,-z,now - VER=$(shell cat ../VERSION) CFLAGS += -DVERSION=\"$(VER)\" CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE LIB_ENTIRE_CFLAGS = $(CFLAGS) -fPIC diff --git a/wdmd/Makefile b/wdmd/Makefile index 74b04e2..5849efc 100644 --- a/wdmd/Makefile +++ b/wdmd/Makefile @@ -2,10 +2,12 @@ # # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions # of the GNU General Public License v2 or (at your option) any later version. +include ../common.mk + CMD_TARGET = wdmd LIB_TARGET = libwdmd HEADER_TARGET = wdmd.h MAN_TARGET = wdmd.8 TEST_TARGET = wdmd_client @@ -18,37 +20,10 @@ CMD_SOURCE = main.c wdmd_sock.c LIB_SOURCE = client.c wdmd_sock.c TEST_SOURCE = wdmd_client.c -CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - -Wall \ - -Wformat \ - -Wformat-security \ - -Wmissing-prototypes \ - -Wnested-externs \ - -Wpointer-arith \ - -Wextra \ - -Wshadow \ - -Wcast-align \ - -Wwrite-strings \ - -Waggregate-return \ - -Wstrict-prototypes \ - -Winline \ - -Wredundant-decls \ - -Wno-sign-compare \ - -Wno-unused-parameter \ - -Wp,-D_FORTIFY_SOURCE=2 \ - -Wno-strict-overflow \ - -fexceptions \ - -fasynchronous-unwind-tables \ - -fdiagnostics-show-option \ - -Wp,-D_GLIBCXX_ASSERTIONS \ - -fstack-protector-strong \ - -fstack-clash-protection \ - -Wl,-z,now - VER=$(shell cat ../VERSION) CFLAGS += -DVERSION=\"$(VER)\" CMD_CFLAGS = $(CFLAGS) -fPIE -DPIE LIB_CFLAGS = $(CFLAGS) -fPIC -- 2.17.2

1 0

[PATCH] python: Unify python extension make command
by Nir Soffer 10 Apr '19

10 Apr '19

Replace the python Makefile inplace target with environment variable, so the top Makefile can be simplified to: $(SUBDIRS): $(MAKE) -C $@ When running tox, we build sanlock extension inside the tox relevant tox environment (e.g. .tox/py27/...). This will be helpful for supporting python 3. On Travis we still build in the python directory - sanlock import fails if we build it elsewhere. This is not an issue for python 3 since on Travis we have separate build for every python version. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- .travis.yml | 5 ++--- Makefile | 2 +- python/Makefile | 5 +---- tox.ini | 4 +--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cc2859..37643f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ dist: xenial language: python +python: 2.7 addons: apt: sources: - ubuntu-toolchain-r-test @@ -14,10 +15,8 @@ before_install: env: - CC="gcc-8" script: - - make -C wdmd - - make -C src - - make -C python inplace + - make BUILDARGS="--build-lib=." - source tests/env.sh - pytest diff --git a/Makefile b/Makefile index bc1b3ce..8b41526 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,11 @@ distname := sanlock-$(version) tarball := $(distname).tar.gz all: $(MAKE) -C wdmd $(MAKE) -C src - $(MAKE) -C python inplace + $(MAKE) -C python clean: $(MAKE) -C wdmd clean $(MAKE) -C src clean $(MAKE) -C python clean diff --git a/python/Makefile b/python/Makefile index 06c2201..c97e45a 100644 --- a/python/Makefile +++ b/python/Makefile @@ -3,14 +3,11 @@ # This copyrighted material is made available to anyone wishing to use, # modify, copy, or redistribute it subject to the terms and conditions # of the GNU General Public License v.2. all: - python2 setup.py build - -inplace: - python2 setup.py build_ext --inplace + python2 setup.py build $(BUILDARGS) install: python2 setup.py install --root=$(DESTDIR) clean: diff --git a/tox.ini b/tox.ini index f65f487..1c2349e 100644 --- a/tox.ini +++ b/tox.ini @@ -12,17 +12,15 @@ skip_missing_interpreters = True passenv = USER setenv = LD_LIBRARY_PATH={env:PWD}/wdmd:{env:PWD}/src SANLOCK_PRIVILEGED=0 SANLOCK_RUN_DIR=/tmp/sanlock - PYTHONPATH={env:PWD}/python -sitepackages = True whitelist_externals = make deps = pytest==4.0 commands = - make + make BUILDARGS="--build-lib={envsitepackagesdir}" pytest {posargs} [pytest] # Notes: # --basetemp: we must use /var/tmp as sanlock uses direct I/O. -- 2.17.2

1 0

[sanlock] branch master updated: release 3.7.1
by pagure＠pagure.io 05 Apr '19

05 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. The following commit(s) were added to refs/heads/master by this push: new 8b9ae27 release 3.7.1 8b9ae27 is described below commit 8b9ae27668d71f13519bf14b029c88e7824dad27 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Apr 5 11:08:40 2019 -0500 release 3.7.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7c69a55..a76ccff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.0 +3.7.1 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] branch master updated: README.rst
by pagure＠pagure.io 05 Apr '19

05 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. The following commit(s) were added to refs/heads/master by this push: new c2df4c0 README.rst c2df4c0 is described below commit c2df4c0266d1e491d9693bfca102f2f07bfe8008 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Apr 5 10:23:30 2019 -0500 README.rst --- README.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.rst b/README.rst index 87a6b59..59df2f1 100644 --- a/README.rst +++ b/README.rst @@ -6,15 +6,15 @@ From sanlock(8) at sanlock.git/src/sanlock.8 :: -SANLOCK(8) System Manager's Manual SANLOCK(8) + SANLOCK(8) System Manager's Manual SANLOCK(8) -NAME + NAME sanlock - shared storage lock manager -SYNOPSIS + SYNOPSIS sanlock [COMMAND] [ACTION] ... -DESCRIPTION + DESCRIPTION sanlock is a lock manager built on shared storage. Hosts with access to the storage can perform locking. An application running on the hosts is given a small amount of space on the shared block device or @@ -473,7 +473,7 @@ DESCRIPTION # sanlock shutdown -OPTIONS + OPTIONS COMMAND can be one of three primary top level choices sanlock daemon start daemon @@ -773,7 +773,7 @@ OPTIONS sanlock version shows the build version. -OTHER + OTHER Request/Examine The first part of making a request for a resource is writing the request record of the resource (the sector following the leader @@ -876,7 +876,7 @@ OTHER about 1 hour of history when using a 20 second renewal interval for a 10 second io timeout. -INTERNALS + INTERNALS Disk Format · This example uses 512 byte sectors. @@ -1026,7 +1026,7 @@ INTERNALS value in the paxos_lease becomes expired, and other hosts will use the paxos algorithm to acquire the paxos_lease, and set a new owner. -FILES + FILES /etc/sanlock/sanlock.conf · quiet_fail = 1 @@ -1096,21 +1096,21 @@ FILES lockspace disk to the align size of the lockspace. Set to a number to set a specific number of KB for all lockspace disks. -SEE ALSO + SEE ALSO wdmd(8) 2015-01-23 SANLOCK(8) -WDMD(8) System Manager's Manual WDMD(8) + WDMD(8) System Manager's Manual WDMD(8) -NAME + NAME wdmd - watchdog multiplexing daemon -SYNOPSIS + SYNOPSIS wdmd [OPTIONS] -DESCRIPTION + DESCRIPTION This daemon opens /dev/watchdog and allows multiple independent sources to detmermine whether each KEEPALIVE is done. Every test interval (10 seconds), the daemon tests each source. If any test fails, the @@ -1158,7 +1158,7 @@ DESCRIPTION failure. If a script does not exit by the end of the test interval, it is considered a failure. -OPTIONS + OPTIONS --version, -V Print version. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] branch master updated: tests: sanlk_load
by pagure＠pagure.io 03 Apr '19

03 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. The following commit(s) were added to refs/heads/master by this push: new 393fbb1 tests: sanlk_load 393fbb1 is described below commit 393fbb12f4b4fbbf9861e17002d0b9940dc480a3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Apr 3 15:46:34 2019 -0500 tests: sanlk_load --- tests/sanlk_load.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/sanlk_load.c b/tests/sanlk_load.c index bc5bbd1..926ccd2 100644 --- a/tests/sanlk_load.c +++ b/tests/sanlk_load.c @@ -545,6 +545,8 @@ int do_rand_child(void) int iter = 1; int pid = getpid(); + error_count = 0; + srandom(pid); memset(lock_state, 0, sizeof(lock_state)); @@ -637,10 +639,13 @@ int do_rand_child(void) } display_rv(pid); - if (error_count) + if (error_count) { + printf("pid %d done error_count %d\n", pid, error_count); exit(EXIT_FAILURE); + } - return 0; + printf("pid %d done\n", pid); + exit(EXIT_SUCCESS); } int do_all_child(void) @@ -898,19 +903,27 @@ int do_rand(int argc, char *argv[]) sleep(1); } - printf("stopping pids"); + printf("stopping pids "); for (i = 0; i < pid_count; i++) kill(children[i], SIGTERM); while (run_count) { + status = 0; + pid = wait(&status); if (pid > 0) { run_count--; - printf("."); - if (WEXITSTATUS(status)) + if (!WIFEXITED(status)) { + error_count++; + printf("-"); + } else if (WEXITSTATUS(status)) { error_count++; + printf("x"); + } else { + printf("."); + } } } printf("\n"); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] branch master updated: tests: sanlk_load use error exit
by pagure＠pagure.io 03 Apr '19

03 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. The following commit(s) were added to refs/heads/master by this push: new a3c0647 tests: sanlk_load use error exit a3c0647 is described below commit a3c0647d27617ffc2070f18bd087c1b9f7fc18c8 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Apr 3 13:08:23 2019 -0500 tests: sanlk_load use error exit --- tests/sanlk_load.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 9 deletions(-) diff --git a/tests/sanlk_load.c b/tests/sanlk_load.c index 4a93374..bc5bbd1 100644 --- a/tests/sanlk_load.c +++ b/tests/sanlk_load.c @@ -49,6 +49,10 @@ int res_count = DEFAULT_RES_COUNT; int pid_count = DEFAULT_PID_COUNT; int one_mode = 0; int our_hostid; +int run_sec; +int count_sec; +int error_count; +int error_range = 1; int acquire_rv[MAX_RV]; int release_rv[MAX_RV]; @@ -64,6 +68,7 @@ do { \ snprintf(error_buf, 4095, "%ld " fmt "\n", time(NULL), ##args); \ printf("ERROR: %s\n", error_buf); \ syslog(LOG_ERR, "%s", error_buf); \ + error_count++; \ } while (0) @@ -112,14 +117,47 @@ static void save_rv(int pid, int rv, int acquire) else release_rv[-rv]++; } + + if (error_range == 1) { + switch (rv) { + case 0: + case -EBUSY: + /* -16 */ + case -EEXIST: + /* -17 */ + case -EAGAIN: + /* -11 */ + break; + default: + log_error("%d ERROR range %d save_rv %d %d", pid, error_range, rv, acquire); + break; + }; + + } else if (error_range == 2) { + switch (rv) { + case 0: + case -EBUSY: + /* -16 */ + case -EEXIST: + /* -17 */ + case -EAGAIN: + /* -11 */ + break; + case -243: + case -244: + case -245: + break; + default: + log_error("%d ERROR range %d save_rv %d %d", pid, error_range, rv, acquire); + break; + }; + } + return; fail: log_error("%d save_rv %d %d", pid, rv, acquire); - while (1) { - sleep(10); - printf("%lu %d ERROR save_rv %d %d", time(NULL), pid, rv, acquire); - } + printf("%lu %d ERROR save_rv %d %d", time(NULL), pid, rv, acquire); } static void display_rv(int pid) @@ -241,11 +279,10 @@ static int check_lock_state(int pid, int result, int count, char *res_state) dump_lock_state(pid); - while (1) { - sleep(10); - printf("%lu %d ERROR check_lock_state result %d count %d found %d bad %d res_state %s", - time(NULL), pid, result, count, found_count, bad_count, res_state); - } + printf("%lu %d ERROR check_lock_state result %d count %d found %d bad %d res_state %s", + time(NULL), pid, result, count, found_count, bad_count, res_state); + + return -1; } #if 0 @@ -599,6 +636,10 @@ int do_rand_child(void) iter++; } display_rv(pid); + + if (error_count) + exit(EXIT_FAILURE); + return 0; } @@ -685,6 +726,9 @@ void get_options(int argc, char *argv[]) case 'i': our_hostid = atoi(optionarg); break; + case 'S': + run_sec = atoi(optionarg); + break; case 's': ls_count = atoi(optionarg); if (ls_count > MAX_LS_COUNT) { @@ -709,6 +753,9 @@ void get_options(int argc, char *argv[]) case 'm': one_mode = atoi(optionarg); break; + case 'e': + error_range = atoi(optionarg); + break; default: log_error("unknown option: %c", optchar); exit(EXIT_FAILURE); @@ -844,6 +891,11 @@ int do_rand(int argc, char *argv[]) add_lockspace(lsi); #endif + + if (run_sec && (count_sec >= run_sec)) + break; + count_sec++; + sleep(1); } printf("stopping pids"); @@ -856,10 +908,18 @@ int do_rand(int argc, char *argv[]) if (pid > 0) { run_count--; printf("."); + + if (WEXITSTATUS(status)) + error_count++; } } printf("\n"); + if (error_count) { + printf("child errors %d\n", error_count); + exit(EXIT_FAILURE); + } + return 0; } @@ -922,6 +982,11 @@ int do_all(int argc, char *argv[]) } printf("\n"); + if (error_count) { + printf("error_count %d\n", error_count); + exit(EXIT_FAILURE); + } + return 0; } @@ -1023,6 +1088,8 @@ int main(int argc, char *argv[]) printf(" -r <num> number of resources per lockspace\n"); printf(" -p <num> number of processes\n"); printf(" -m <num> use one mode for all locks, 3 = SH, 5 = EX\n"); + printf(" -S <num> seconds to run (0 unlimited)\n"); + printf(" -e <num> error range expected (1 single node, 2 multi node)\n"); printf(" -D debug output\n"); printf(" -V verbose debug output\n"); printf("\n"); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 03/03: tox: Use the Makefile to build
by pagure＠pagure.io 03 Apr '19

03 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit 35bc4f7ed8b6284ee56610ad9272ee290734f72f Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Mon Mar 25 01:42:59 2019 +0200 tox: Use the Makefile to build Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- tox.ini | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index ae9c8a7..f65f487 100644 --- a/tox.ini +++ b/tox.ini @@ -20,9 +20,7 @@ whitelist_externals = make deps = pytest==4.0 commands = - make -C wdmd - make -C src - make -C python inplace + make pytest {posargs} [pytest] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 02/03: build: Disable %set_build_flags on RHEL
by pagure＠pagure.io 03 Apr '19

03 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit 20efe914810efc0e8c19606ef09d9b33a73357a7 Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Mon Mar 25 02:09:03 2019 +0200 build: Disable %set_build_flags on RHEL With this change the same spec can be used both on Fedora and RHEL. Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- sanlock.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sanlock.spec.in b/sanlock.spec.in index de72863..0bd9e34 100644 --- a/sanlock.spec.in +++ b/sanlock.spec.in @@ -24,7 +24,9 @@ The sanlock daemon manages leases for applications on hosts using shared storage %setup -q %build +%if 0%{?fedora} %set_build_flags +%endif # upstream does not require configure # upstream does not support _smp_mflags CFLAGS=$RPM_OPT_FLAGS make -C wdmd -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] 01/03: Add minimal development build
by pagure＠pagure.io 03 Apr '19

03 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. commit 371e11a9ec05f4a5c235b8ca07371086a7d411dd Author: Nir Soffer <nsoffer(a)redhat.com> AuthorDate: Sun Mar 24 19:41:33 2019 +0200 Add minimal development build Add minimal build system for making it easy to create rpms for development. When building from annotated tag, create clean rpm name: sanlock-3.7.0-0.fc28.src.rpm If we are past an annotated tag, add the number of commits since the last tag and the git hash to the release: sanlock-3.7.0-5.g569c1fc.fc28.src.rpm Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- .gitignore | 2 + Makefile | 38 ++++++++ sanlock.spec.in | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 323 insertions(+) diff --git a/.gitignore b/.gitignore index d46effb..dec4e89 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ tests/sanlk_client tests/sanlk_load tests/sanlk_path tests/__pycache__/ +sanlock.spec +*.tar diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..bc1b3ce --- /dev/null +++ b/Makefile @@ -0,0 +1,38 @@ +version := $(shell cat VERSION) + +ifeq ($(shell git describe --exact-match 2>/dev/null),) +# sanlock-3.7.0-5-g11fb098 -> 5.g11fb098 +release := $(shell git describe --tags | awk -F- '{print $$(NF-1) "." $$(NF)}') +else +release := 0 +endif + +distname := sanlock-$(version) +tarball := $(distname).tar.gz + +all: + $(MAKE) -C wdmd + $(MAKE) -C src + $(MAKE) -C python inplace + +clean: + $(MAKE) -C wdmd clean + $(MAKE) -C src clean + $(MAKE) -C python clean + +dist: spec + rm -f $(tarball) + git archive --prefix=$(distname)/ HEAD > $(distname).tar + tar rf $(distname).tar --transform="s|^|$(distname)/&|" sanlock.spec + gzip $(distname).tar + +srpm: dist + rpmbuild -ts $(tarball) + +rpm: dist + rpmbuild -ta $(tarball) + +spec: + sed -e 's/@VERSION@/$(version)/g' \ + -e 's/@RELEASE@/$(release)/g' \ + sanlock.spec.in > sanlock.spec diff --git a/sanlock.spec.in b/sanlock.spec.in new file mode 100644 index 0000000..de72863 --- /dev/null +++ b/sanlock.spec.in @@ -0,0 +1,283 @@ +Name: sanlock +Version: @VERSION@ +Release: @RELEASE@%{?dist} +Summary: A shared storage lock manager + +License: GPLv2 and GPLv2+ and LGPLv2+ +URL: https://pagure.io/sanlock/ +BuildRequires: gcc +BuildRequires: libblkid-devel libaio-devel python2 python2-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 + +%description +The sanlock daemon manages leases for applications on hosts using shared storage. + +%prep +%setup -q + +%build +%set_build_flags +# 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 reset + +%install +rm -rf $RPM_BUILD_ROOT +make -C src \ + install LIBDIR=%{_libdir} \ + DESTDIR=$RPM_BUILD_ROOT +make -C wdmd \ + install LIBDIR=%{_libdir} \ + DESTDIR=$RPM_BUILD_ROOT +make -C python \ + install LIBDIR=%{_libdir} \ + DESTDIR=$RPM_BUILD_ROOT +make -C reset \ + install LIBDIR=%{_libdir} \ + DESTDIR=$RPM_BUILD_ROOT + + +install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service +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 + +install -D -m 0644 src/sanlock.conf \ + $RPM_BUILD_ROOT/etc/sanlock/sanlock.conf + +install -D -m 0644 init.d/wdmd.sysconfig \ + $RPM_BUILD_ROOT/etc/sysconfig/wdmd + +install -Dd -m 0755 $RPM_BUILD_ROOT/etc/wdmd.d +install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlock +install -Dd -m 0775 $RPM_BUILD_ROOT/%{_localstatedir}/run/sanlk-resetd + +%pre +getent group sanlock > /dev/null || /usr/sbin/groupadd \ + -g 179 sanlock +getent passwd sanlock > /dev/null || /usr/sbin/useradd \ + -u 179 -c "sanlock" -s /sbin/nologin -r \ + -g 179 -d /var/run/sanlock sanlock +/usr/sbin/usermod -a -G disk sanlock + +%post +%systemd_post wdmd.service sanlock.service + +%preun +%systemd_preun wdmd.service sanlock.service + +%postun +%systemd_postun + +%files +/usr/lib/systemd/systemd-wdmd +%{_unitdir}/sanlock.service +%{_unitdir}/wdmd.service +%{_sbindir}/sanlock +%{_sbindir}/wdmd +%dir %{_sysconfdir}/wdmd.d +%dir %{_sysconfdir}/sanlock +%dir %attr(-,sanlock,sanlock) %{_localstatedir}/run/sanlock +%{_mandir}/man8/wdmd* +%{_mandir}/man8/sanlock* +%config(noreplace) %{_sysconfdir}/logrotate.d/sanlock +%config(noreplace) %{_sysconfdir}/sanlock/sanlock.conf +%config(noreplace) %{_sysconfdir}/sysconfig/wdmd +%doc init.d/sanlock +%doc init.d/sanlock.service +%doc init.d/wdmd.service + +%package lib +Summary: A shared storage lock manager library + +%description lib +The %{name}-lib package contains the runtime libraries for sanlock, +a shared storage lock manager. +Hosts connected to a common SAN can use this to synchronize their +access to the shared disks. + +%ldconfig_scriptlets lib + +%files lib +%{_libdir}/libsanlock.so.* +%{_libdir}/libsanlock_client.so.* +%{_libdir}/libwdmd.so.* + +%package -n python2-sanlock +%{?python_provide:%python_provide python2-sanlock} +# Remove before F30 +Provides: %{name}-python = %{version}-%{release} +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} +Summary: Python bindings for the sanlock library +Requires: %{name}-lib = %{version}-%{release} + +%description -n python2-sanlock +The %{name}-python package contains a module that permits applications +written in the Python programming language to use the interface +supplied by the sanlock library. + +%files -n python2-sanlock +%{python2_sitearch}/sanlock_python-*.egg-info +%{python2_sitearch}/sanlock.so + +%package devel +Summary: Development files for %{name} +Requires: %{name}-lib = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%files devel +%{_libdir}/libwdmd.so +%{_includedir}/wdmd.h +%{_libdir}/libsanlock.so +%{_libdir}/libsanlock_client.so +%{_includedir}/sanlock.h +%{_includedir}/sanlock_rv.h +%{_includedir}/sanlock_admin.h +%{_includedir}/sanlock_resource.h +%{_includedir}/sanlock_direct.h +%{_libdir}/pkgconfig/libsanlock.pc +%{_libdir}/pkgconfig/libsanlock_client.pc + +%package -n sanlk-reset +Summary: Host reset daemon and client using sanlock +Requires: sanlock = %{version}-%{release} +Requires: sanlock-lib = %{version}-%{release} + +%description -n sanlk-reset +The sanlk-reset package contains the reset daemon and client. +A cooperating host running the daemon can be reset by a host +running the client, so long as both maintain access to a +common sanlock lockspace. + +%files -n sanlk-reset +%{_sbindir}/sanlk-reset +%{_sbindir}/sanlk-resetd +%{_unitdir}/sanlk-resetd.service +%dir %attr(-,root,root) %{_localstatedir}/run/sanlk-resetd +%{_mandir}/man8/sanlk-reset* + + +%changelog +* Wed Mar 20 2019 Nir Soffer <nsoffer(a)redhat.com> - 3.7.0-1 +- remove unneeded with_systemd macro +- update to sanlock 3.7.0 + +* Sat Feb 2 2019 Nir Soffer <nsoffer(a)redhat.com> - 3.6.0-8 +- fix build on Fedora rawhide + +* Thu Jan 24 2019 David Teigland <teigland(a)redhat.com> - 3.6.0-7 +- lockfile ownership + +* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Apr 12 2018 Iryna Shcherbina <shcherbina.iryna(a)gmail.com> - 3.6.0-5 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Mar 14 2018 David Teigland <teigland(a)redhat.com> - 3.6.0-4 +- change makefile flags + +* Wed Mar 14 2018 David Teigland <teigland(a)redhat.com> - 3.6.0-3 +- rebuild with set_build_flags + +* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Dec 12 2017 David Teigland <teigland(a)redhat.com> - 3.6.0-1 +- Update to sanlock-3.6.0, drop fence_sanlock + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.5.0-6 +- Add Provides for the old name without %%_isa + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.5.0-5 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.5.0-4 +- Python 2 binary package renamed to python2-sanlock + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 01 2017 David Teigland <teigland(a)redhat.com> - 3.5.0-1 +- Update to sanlock-3.5.0 + +* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.4.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… + +* Fri Jun 10 2016 David Teigland <teigland(a)redhat.com> - 3.4.0-1 +- Update to sanlock-3.4.0 + +* Tue Feb 23 2016 David Teigland <teigland(a)redhat.com> - 3.3.0-2 +- remove exclusive arch + +* Mon Feb 22 2016 David Teigland <teigland(a)redhat.com> - 3.3.0-1 +- Update to sanlock-3.3.0 + +* Tue Dec 01 2015 David Teigland <teigland(a)redhat.com> - 3.2.4-2 +- wdmd: prevent probe while watchdog is used + +* Fri Jun 19 2015 David Teigland <teigland(a)redhat.com> - 3.2.4-1 +- Update to sanlock-3.2.4 + +* Fri May 22 2015 David Teigland <teigland(a)redhat.com> - 3.2.3-2 +- add pkgconfig files + +* Wed May 20 2015 David Teigland <teigland(a)redhat.com> - 3.2.3-1 +- Update to sanlock-3.2.3 + +* Thu Oct 30 2014 David Teigland <teigland(a)redhat.com> - 3.2.2-2 +- checksum endian fix + +* Mon Sep 29 2014 David Teigland <teigland(a)redhat.com> - 3.2.2-1 +- Update to sanlock-3.2.2 + +* Thu Aug 21 2014 David Teigland <teigland(a)redhat.com> - 3.2.1-1 +- Update to sanlock-3.2.1 + +* Mon Aug 18 2014 David Teigland <teigland(a)redhat.com> - 3.2.0-1 +- Update to sanlock-3.2.0 + +* Wed Jan 29 2014 David Teigland <teigland(a)redhat.com> - 3.1.0-2 +- version interface + +* Tue Jan 07 2014 David Teigland <teigland(a)redhat.com> - 3.1.0-1 +- Update to sanlock-3.1.0 + +* Fri Dec 27 2013 Daniel Mach <dmach(a)redhat.com> - 3.0.1-3 +- Mass rebuild 2013-12-27 + +* Thu Aug 01 2013 David Teigland <teigland(a)redhat.com> - 3.0.1-2 +- use /usr/lib instead of /lib + +* Wed Jul 31 2013 David Teigland <teigland(a)redhat.com> - 3.0.1-1 +- Update to sanlock-3.0.1 + +* Wed Jul 24 2013 David Teigland <teigland(a)redhat.com> - 3.0.0-1 +- Update to sanlock-3.0.0 + -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[sanlock] branch master updated: sanlock: direct dump fix variable init
by pagure＠pagure.io 02 Apr '19

02 Apr '19

This is an automated email from the git hooks/post-receive script. teigland pushed a commit to branch master in repository sanlock. The following commit(s) were added to refs/heads/master by this push: new bb7f04e sanlock: direct dump fix variable init bb7f04e is described below commit bb7f04e8fb3bec76cdecb00aa20d82b147d3a3d9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Apr 2 16:19:06 2019 -0500 sanlock: direct dump fix variable init --- src/direct.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/direct.c b/src/direct.c index e1d505e..344fe3d 100644 --- a/src/direct.c +++ b/src/direct.c @@ -569,7 +569,9 @@ int direct_dump(struct task *task, char *dump_path, int force_mode) uint64_t sector_nr; uint64_t dump_size = 0; uint64_t end_sector_nr; - int sector_size, sector_count, datalen, align_size, max_hosts; + int sector_size = 0; + int align_size = 0; + int sector_count, datalen, max_hosts; int i, j, rv, b; memset(&sd, 0, sizeof(struct sync_disk)); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

sanlock-devel April 2019