bn8/check_syncrepl_extended
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity Actions

Fix touch mode when touch value is already in touch attibute and add --remove-touch-value parameter

Browse source
This commit is contained in:
Benjamin Renard 2019-12-20 10:46:47 +01:00 committed by root
parent 5b462ecc8a
commit 99aa93a497
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
check_syncrepl_extended
View file

@ -155,6 +155,12 @@ parser.add_option( "--replace-touch",
help="In touch mode, replace value instead of adding.", help="In touch mode, replace value instead of adding.",
default=False) default=False)
parser.add_option( "--remove-touch-value",
dest="removetouchvalue",
action="store_true",
help="In touch mode, remove touch value if present.",
default=False)
parser.add_option( "--page-size", parser.add_option( "--page-size",
dest="page_size", dest="page_size",
action="store", action="store",
@ -309,19 +315,30 @@ class LdapServer(object):
return [] return []
def touch_object(self,dn,attr,orig_value): def touch_object(self,dn,attr,orig_value):
old = {}
if orig_value:
old[attr] = orig_value
new = {}
if options.replacetouch: if options.replacetouch:
new_value=[TOUCH_VALUE] if not orig_value or TOUCH_VALUE not in orig_value:
new[attr] = [TOUCH_VALUE]
else: else:
new_value=list(orig_value) new[attr] = list(orig_value)
new_value.append(TOUCH_VALUE) if orig_value or TOUCH_VALUE in orig_value:
new[attr].remove(TOUCH_VALUE)
else:
new[attr].append(TOUCH_VALUE)
try: try:
logging.info('Add value "%s" to attribute %s of object %s' % (TOUCH_VALUE,attr,dn)) logging.info('Touch object "%s" on attribute "%s" : %s => %s', dn, attr, old, new)
if self.update_object(dn,{attr: orig_value}, {attr: new_value}): if self.update_object(dn, old, new):
logging.info('Remove value "%s" to attribute %s of object %s' % (TOUCH_VALUE,attr,dn)) logging.info('Restore original value of attribute "%s" of object "%s"', attr, dn)
self.update_object(dn,{attr: new_value}, {attr: orig_value}) if options.removetouchvalue and TOUCH_VALUE in old[attr]:
old[attr].remove(TOUCH_VALUE)
self.update_object(dn, new, old)
return True return True
except ldap.LDAPError, e: except ldap.LDAPError:
logging.error('Error touching object %s : %s' % (dn,e)) logging.error('Error touching object "%s"', dn, exc_info=True)
return False return False
if options.nocheckcert: if options.nocheckcert: