Re: [PATCH 1/4] python: Add align and sector arguments to read_resource_owners()

[Nir Soffer]

On Tue, May 7, 2019 at 5:23 PM Vojtech Juranek <vjuranek(a)redhat.com&gt; wrote:

>  On úterý 7. května 2019 0:38:10 CEST Nir Soffer wrote:
>  > We forgot to add the flags to this function, and it works with 4k
>  > storage because sanlock implements a fallback mechanism. Since we
>  > require align and sector arguments in read_resource(), we should also
>  > require them for consistency in read_resource_owners().
>
>  you should also update read_resource_owners call in examples:
>  https://github.com/nirs/sanlock/blob/4k-tests/python/example.py#L57
>
>  
Right, will update in next version.



>  > Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
>  > ---
>  >  python/sanlock.c | 24 +++++++++++++++++++-----
>  >  1 file changed, 19 insertions(+), 5 deletions(-)
>  >
>  > diff --git a/python/sanlock.c b/python/sanlock.c
>  > index d6841e8..4be9be2 100644
>  > --- a/python/sanlock.c
>  > +++ b/python/sanlock.c
>  > @@ -1195,30 +1195,36 @@ exit_fail:
>  >      return NULL;
>  >  }
>  >
>  >  /* read_resource_owners */
>  >  PyDoc_STRVAR(pydoc_read_resource_owners, "\
>  > -read_resource_owners(lockspace, resource, disks) -> list\n\
>  > +read_resource_owners(lockspace, resource, disks, align=1048576,
>  sector=512)
>  > \
>   +-> list\n\
>  >  Returns the list of hosts owning a resource, the list is not filtered
>  > and\n\
>   it might contain hosts that are currently failing or dead. The
>  > hosts are\n\ returned in the same format used by get_hosts.\n\
>  > -The disks must be in the format: [(path, offset), ... ]");
>  > +The disks must be in the format: [(path, offset), ... ].\n\
>  > +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 sector = SECTOR_SIZE_512;
>  > +    long align = ALIGNMENT_1M;
>  >      const char *lockspace, *resource;
>  >      struct sanlk_resource *res = NULL;
>  >      struct sanlk_host *hss = NULL;
>  >      PyObject *disks, *ls_list = NULL;
>  >
>  > -    static char *kwlist[] = {"lockspace", "resource",
> "disks", NULL};
>  > +    static char *kwlist[] = {"lockspace", "resource",
> "disks", "align",
>  > +                             "sector", NULL};
>  >
>  >      /* parse python tuple */
>  > -    if (!PyArg_ParseTupleAndKeywords(args, keywds, "ssO!", kwlist,
>  > -        &lockspace, &resource, &PyList_Type, &disks)) {
>  > +    if (!PyArg_ParseTupleAndKeywords(args, keywds, "ssO!|li", kwlist,
>  > +        &lockspace, &resource, &PyList_Type, &disks, &align,
> &sector)) {
>  >          return NULL;
>  >      }
>  >
>  >      /* parse and check sanlock resource */
>  >      if (__parse_resource(disks, &res) < 0) {
>  > @@ -1227,10 +1233,18 @@ py_read_resource_owners(PyObject *self __unused,
>  > PyObject *args, PyObject *keywd
>
>  >      /* prepare sanlock names */
>  >      strncpy(res->lockspace_name, lockspace, SANLK_NAME_LEN);
>  >      strncpy(res->name, resource, SANLK_NAME_LEN);
>  >
>  > +    /* set resource alignment/sector flags */
>  > +
>  > +    if (add_align_flag(align, &res->flags) == -1)
>  > +        goto exit_fail;
>  > +
>  > +    if (add_sector_flag(sector, &res->flags) == -1)
>  > +        goto exit_fail;
>  > +
>  >      /* read resource owners (gil disabled) */
>  >      Py_BEGIN_ALLOW_THREADS
>  >      rv = sanlock_read_resource_owners(res, 0, &hss, &hss_count);
>  >      Py_END_ALLOW_THREADS
>  >
>  > --
>  > 2.17.2
>  > _______________________________________________
>  > sanlock-devel mailing list -- sanlock-devel(a)lists.fedorahosted.org
>  > To unsubscribe send an email to
>  sanlock-devel-leave(a)lists.fedorahosted.org
>  > Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
>  > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
>  > List Archives:
>  >
>  https://lists.fedorahosted.org/archives/list/[e-mail]
>  > ed.org
>
>  _______________________________________________
>  sanlock-devel mailing list -- sanlock-devel(a)lists.fedorahosted.org
>  To unsubscribe send an email to sanlock-devel-leave(a)lists.fedorahosted.org
>  Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
>  List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
>  List Archives:
>  https://lists.fedorahosted.org/archives/list/[e-mail]...
>