홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
Committed by Gerrit Code Review
5ddaf19f 1 parent b0b6cbf5

Ensure exceptions in map event handling do not prevent event acknowledgement 

Set default consistency for ConsistentMap operations to SEQUENTIAL

Change-Id: I8896ae953932bf323c4512842000e78bf395f9b1
Inline Side-by-side
Showing 2 changed files with 12 additions and 3 deletions
......@@ -15,6 +15,7 @@
*/
package org.onosproject.store.primitives.resources.impl;
import static org.slf4j.LoggerFactory.getLogger;
import io.atomix.copycat.client.CopycatClient;
import io.atomix.resource.AbstractResource;
import io.atomix.resource.ResourceTypeInfo;
......@@ -52,6 +53,7 @@ import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.MapTransaction;
import org.onosproject.store.service.Versioned;
import org.slf4j.Logger;
import com.google.common.collect.Sets;
......@@ -62,6 +64,7 @@ import com.google.common.collect.Sets;
public class AtomixConsistentMap extends AbstractResource<AtomixConsistentMap>
implements AsyncConsistentMap<String, byte[]> {
private final Logger log = getLogger(getClass());
private final Set<MapEventListener<String, byte[]>> mapEventListeners = Sets.newCopyOnWriteArraySet();
public static final String CHANGE_SUBJECT = "changeEvents";
......@@ -84,7 +87,13 @@ public class AtomixConsistentMap extends AbstractResource<AtomixConsistentMap>
}
private void handleEvent(List<MapEvent<String, byte[]>> events) {
events.forEach(event -> mapEventListeners.forEach(listener -> listener.event(event)));
events.forEach(event -> mapEventListeners.forEach(listener -> {
try {
listener.event(event);
} catch (Exception e) {
log.warn("Error processing map event", e);
}
}));
}
@Override
......
......@@ -52,7 +52,7 @@ public final class AtomixConsistentMapCommands {
@Override
public ConsistencyLevel consistency() {
return ConsistencyLevel.LINEARIZABLE;
return ConsistencyLevel.SEQUENTIAL;
}
@Override
......@@ -78,7 +78,7 @@ public final class AtomixConsistentMapCommands {
@Override
public ConsistencyLevel consistency() {
return ConsistencyLevel.BOUNDED_LINEARIZABLE;
return ConsistencyLevel.SEQUENTIAL;
}
@Override
......