|
Lines 748-757
Link Here
|
| 748 |
return True # file not found so there's nothing to sync |
748 |
return True # file not found so there's nothing to sync |
| 749 |
except (cPickle.UnpicklingError, EOFError) as e: |
749 |
except (cPickle.UnpicklingError, EOFError) as e: |
| 750 |
message = 'file emtpy' if isinstance(e, EOFError) else e.message |
750 |
message = 'file emtpy' if isinstance(e, EOFError) else e.message |
| 751 |
ud.debug(ud.LDAP, ud.WARN, |
751 |
ud.debug(ud.LDAP, ud.ERROR, |
| 752 |
'__sync_file_from_ucs: invalid pickle file {}: {}'.format(filename, message)) |
752 |
'__sync_file_from_ucs: invalid pickle file {}: {}'.format(filename, message)) |
| 753 |
# ignore corrupted pickle file, but save as rejected to not try again |
753 |
# ignore corrupted pickle file, but save as rejected to not try again |
| 754 |
self._save_rejected_ucs(filename, 'unknown') |
754 |
self._save_rejected_ucs(filename, 'ERROR: broken file') |
| 755 |
return False |
755 |
return False |
| 756 |
|
756 |
|
| 757 |
if dn == 'cn=Subschema': |
757 |
if dn == 'cn=Subschema': |
|
Lines 1037-1042
Link Here
|
| 1037 |
|
1037 |
|
| 1038 |
if rejected: |
1038 |
if rejected: |
| 1039 |
for filename, dn in rejected: |
1039 |
for filename, dn in rejected: |
|
|
1040 |
if dn in ('ERROR: broken file',): |
| 1041 |
continue |
| 1040 |
ud.debug(ud.LDAP, ud.PROCESS, 'sync from ucs: Resync rejected file: %s' % (filename)) |
1042 |
ud.debug(ud.LDAP, ud.PROCESS, 'sync from ucs: Resync rejected file: %s' % (filename)) |
| 1041 |
try: |
1043 |
try: |
| 1042 |
if self.__sync_file_from_ucs(filename, append_error=' rejected'): |
1044 |
if self.__sync_file_from_ucs(filename, append_error=' rejected'): |
|
Lines 1098-1107
Link Here
|
| 1098 |
continue # file not found so there's nothing to sync |
1100 |
continue # file not found so there's nothing to sync |
| 1099 |
except (cPickle.UnpicklingError, EOFError) as e: |
1101 |
except (cPickle.UnpicklingError, EOFError) as e: |
| 1100 |
message = 'file emtpy' if isinstance(e, EOFError) else e.message |
1102 |
message = 'file emtpy' if isinstance(e, EOFError) else e.message |
| 1101 |
ud.debug(ud.LDAP, ud.WARN, |
1103 |
ud.debug(ud.LDAP, ud.ERROR, |
| 1102 |
'poll_ucs: invalid pickle file {}: {}'.format(filename, message)) |
1104 |
'poll_ucs: invalid pickle file {}: {}'.format(filename, message)) |
| 1103 |
# ignore corrupted pickle file, but save as rejected to not try again |
1105 |
# ignore corrupted pickle file, but save as rejected to not try again |
| 1104 |
self._save_rejected_ucs(filename, 'unknown') |
1106 |
self._save_rejected_ucs(filename, 'ERROR: broken file') |
| 1105 |
continue |
1107 |
continue |
| 1106 |
|
1108 |
|
| 1107 |
for i in [0, 1]: # do it twice if the LDAP connection was closed |
1109 |
for i in [0, 1]: # do it twice if the LDAP connection was closed |