for peer_object_id, object in objects.iteritems():
if peer_object_id not in peer_objects:
object.delete(commit = False)
- print classobj, "object %d deleted" % object[object.primary_key]
+ print classobj(self.api).__class__.__name__, "object %s deleted" % object[object.class_key]
# Add/update new/existing objects
for peer_object_id, peer_object in peer_objects.iteritems():
synced[peer_object_id] = object
if dbg:
- print >> log, peer['peername'], classobj(self.api).__class__.__name__, object[object.primary_key], dbg
+ print >> log, peer['peername'], classobj(self.api).__class__.__name__, \
+ object[object.class_key], object[object.primary_key], dbg
return synced
peer_person = persons_at_peer[peer_person_id]
# Foreign keys currently belonging to the user
- old_person_key_ids = [key_transcoder[key_id] for key_id in person['key_ids']]
+ old_person_key_ids = [key_transcoder[key_id] for key_id in person['key_ids'] \
+ if key_transcoder[key_id] in peer_keys]
# Foreign keys that should belong to the user
# this is basically peer_person['key_ids'], we just check it makes sense
# (e.g. we might have failed importing it)
- person_key_ids = [ x for x in peer_person['key_ids'] if x in peer_keys]
+ person_key_ids = [ key_id for key_id in peer_person['key_ids'] if key_id in peer_keys]
# Remove stale keys from user
- for peer_key_id in (set(old_person_key_ids) - set(person_key_ids)):
- person.remove_key(peer_keys[peer_key_id], commit = False)
+ for key_id in (set(old_person_key_ids) - set(person_key_ids)):
+ person.remove_key(peer_keys[key_id], commit = False)
+ print >> log, peer['peername'], 'Key', key_id, 'removed from', person['email']
# Add new keys to user
- for peer_key_id in (set(person_key_ids) - set(old_person_key_ids)):
- person.add_key(peer_keys[peer_key_id], commit = False)
+ for key_id in (set(person_key_ids) - set(old_person_key_ids)):
+ person.add_key(peer_keys[key_id], commit = False)
+ print >> log, peer['peername'], 'Key', key_id, 'added into', person['email']
timers['persons'] = time.time() - start
peer_slice = slices_at_peer[peer_slice_id]
# Nodes that are currently part of the slice
- old_slice_node_ids = [ node_transcoder[node_id] for node_id in slice['node_ids']]
+ old_slice_node_ids = [ node_transcoder[node_id] for node_id in slice['node_ids'] \
+ if node_transcoder[node_id] in peer_nodes]
# Nodes that should be part of the slice
- slice_node_ids = [ x for x in peer_slice['node_ids'] if x in peer_nodes]
+ slice_node_ids = [ node_id for node_id in peer_slice['node_ids'] if node_id in peer_nodes]
# Remove stale nodes from slice
for node_id in (set(old_slice_node_ids) - set(slice_node_ids)):
slice.remove_node(peer_nodes[node_id], commit = False)
+ print >> log, peer['peername'], 'Node', peer_nodes[node_id]['hostname'], 'removed from', slice['name']
# Add new nodes to slice
for node_id in (set(slice_node_ids) - set(old_slice_node_ids)):
slice.add_node(peer_nodes[node_id], commit = False)
+ print >> log, peer['peername'], 'Node', peer_nodes[node_id]['hostname'], 'added into', slice['name']
# N.B.: Local nodes that may have been added to the slice
# by hand, are removed. In other words, don't do this.
# Foreign users that are currently part of the slice
- old_slice_person_ids = [ person_transcoder[person_id] for person_id in slice['person_ids']]
+ old_slice_person_ids = [ person_transcoder[person_id] for person_id in slice['person_ids'] \
+ if person_transcoder[person_id] in peer_persons]
# Foreign users that should be part of the slice
- slice_person_ids = [ x for x in peer_slice['person_ids'] if x in peer_persons]
+ slice_person_ids = [ person_id for person_id in peer_slice['person_ids'] if person_id in peer_persons ]
# Remove stale users from slice
- for peer_person_id in (set(old_slice_person_ids) - set(slice_person_ids)):
- slice.remove_person(peer_persons[peer_person_id], commit = False)
+ for person_id in (set(old_slice_person_ids) - set(slice_person_ids)):
+ slice.remove_person(peer_persons[person_id], commit = False)
+ print >> log, peer['peername'], 'User', peer_persons[person_id]['email'], 'removed from', slice['name']
# Add new users to slice
- for peer_person_id in (set(slice_person_ids) - set(old_slice_person_ids)):
- slice.add_person(peer_persons[peer_person_id], commit = False)
+ for person_id in (set(slice_person_ids) - set(old_slice_person_ids)):
+ slice.add_person(peer_persons[person_id], commit = False)
+ print >> log, peer['peername'], 'User', peer_persons[person_id]['email'], 'added into', slice['name']
# N.B.: Local users that may have been added to the slice
# by hand, are not touched.