recipe/equeue: fix lock file

The '.lock' suffix is automatically added by lockfile. See
https://opendev.org/openstack/pylockfile/src/tag/0.12.2/lockfile/__init__.py#L218

See nexedi/slapos!739

slapos/recipe/equeue.py

@@ -30,11 +30,14 @@ class Recipe(GenericBaseRecipe):
 
   def install(self):
 
+    if not self.options['lockfile'].endswith('.lock'):
+      raise ValueError('lockfile parameter must end with .lock as equeue process will add .lock suffix')
+
     args = [
       self.options['equeue-binary'],
       '--database', self.options['database'],
       '--logfile', self.options['log'],
-      '--lockfile', self.options['lockfile']
+      '--lockfile', self.options['lockfile'][:-5]
     ]
 
     if 'takeover-triggered-file-path' in self.options:

[Julien Muchembled]

It is better to do this kind of check in __init__.

And the appropriate exception for this is zc.buildout.UserError.

[Julien Muchembled]

(if it's going to fail, better know it early)

[Thomas Gambier]

I can do but I already released slapos.cookbook. Is it worth rereleasing slapos.cookbook?

[Julien Muchembled]

No.

[Thomas Gambier]

done in ed0e6b41