홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
76b046e4 1 parent 4cee50fc

Ignore device event if not master not to cause concurrent registrations 

This patch resolves ONOS-4032

Change-Id: I12e2ed7d352928fe94559ab978f5db7e9f56f1b0
Inline Side-by-side
Showing 2 changed files with 17 additions and 3 deletions
......@@ -21,6 +21,7 @@ import org.onlab.packet.MplsLabel;
import org.onlab.packet.VlanId;
import org.onlab.util.Bandwidth;
import org.onlab.util.ItemNotFoundException;
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
......@@ -67,6 +68,7 @@ final class ResourceDeviceListener implements DeviceListener {
private final ResourceAdminService adminService;
private final ResourceService resourceService;
private final DeviceService deviceService;
private final MastershipService mastershipService;
private final DriverService driverService;
private final NetworkConfigService netcfgService;
private final ExecutorService executor;
......@@ -78,16 +80,19 @@ final class ResourceDeviceListener implements DeviceListener {
* @param adminService instance invoked to register resources
* @param resourceService {@link ResourceService} to be used
* @param deviceService {@link DeviceService} to be used
* @param mastershipService {@link MastershipService} to be used
* @param driverService {@link DriverService} to be used
* @param netcfgService {@link NetworkConfigService} to be used.
* @param executor executor used for processing resource registration
*/
ResourceDeviceListener(ResourceAdminService adminService, ResourceService resourceService,
DeviceService deviceService, DriverService driverService,
NetworkConfigService netcfgService, ExecutorService executor) {
DeviceService deviceService, MastershipService mastershipService,
DriverService driverService, NetworkConfigService netcfgService,
ExecutorService executor) {
this.adminService = checkNotNull(adminService);
this.resourceService = checkNotNull(resourceService);
this.deviceService = checkNotNull(deviceService);
this.mastershipService = checkNotNull(mastershipService);
this.driverService = checkNotNull(driverService);
this.netcfgService = checkNotNull(netcfgService);
this.executor = checkNotNull(executor);
......@@ -96,6 +101,11 @@ final class ResourceDeviceListener implements DeviceListener {
@Override
public void event(DeviceEvent event) {
Device device = event.subject();
// registration happens only when the caller is the master of the device
if (!mastershipService.isLocalMaster(device.id())) {
return;
}
switch (event.type()) {
case DEVICE_ADDED:
registerDeviceResource(device);
......
......@@ -23,6 +23,7 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.mastership.MastershipService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.config.ConfigFactory;
import org.onosproject.net.config.NetworkConfigListener;
......@@ -63,6 +64,9 @@ public final class ResourceRegistrar {
protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected MastershipService mastershipService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected NetworkConfigRegistry cfgRegistry;
private final Logger log = getLogger(getClass());
......@@ -92,7 +96,7 @@ public final class ResourceRegistrar {
cfgRegistry.addListener(cfgListener);
deviceListener = new ResourceDeviceListener(adminService, resourceService,
deviceService, driverService, cfgRegistry, executor);
deviceService, mastershipService, driverService, cfgRegistry, executor);
deviceService.addListener(deviceListener);
// TODO Attempt initial registration of existing resources?
......