Andrea Campanella
Committed by Gerrit Code Review

Changing submit to execute in different providers for exception throwing

Change-Id: I2d93b365640e3be48de913e1a069d5f5a53eb303
...@@ -785,7 +785,7 @@ public class LldpLinkProvider extends AbstractProvider implements LinkProvider { ...@@ -785,7 +785,7 @@ public class LldpLinkProvider extends AbstractProvider implements LinkProvider {
785 785
786 @Override 786 @Override
787 public void event(NetworkConfigEvent event) { 787 public void event(NetworkConfigEvent event) {
788 - SharedExecutors.getSingleThreadExecutor().execute(() -> { 788 + SharedExecutors.getPoolThreadExecutor().execute(() -> {
789 if (event.configClass() == LinkDiscoveryFromDevice.class && 789 if (event.configClass() == LinkDiscoveryFromDevice.class &&
790 CONFIG_CHANGED.contains(event.type())) { 790 CONFIG_CHANGED.contains(event.type())) {
791 791
......
...@@ -92,7 +92,7 @@ public class NetconfDeviceProvider extends AbstractProvider ...@@ -92,7 +92,7 @@ public class NetconfDeviceProvider extends AbstractProvider
92 private static final String UNKNOWN = "unknown"; 92 private static final String UNKNOWN = "unknown";
93 93
94 private final ExecutorService executor = 94 private final ExecutorService executor =
95 - Executors.newFixedThreadPool(5, groupedThreads("onos/netconfdeviceprovider", "device-installer-%d")); 95 + Executors.newFixedThreadPool(5, groupedThreads("onos/netconfdeviceprovider", "device-installer-%d", log));
96 96
97 private DeviceProviderService providerService; 97 private DeviceProviderService providerService;
98 private NetconfDeviceListener innerNodeListener = new InnerNetconfDeviceListener(); 98 private NetconfDeviceListener innerNodeListener = new InnerNetconfDeviceListener();
...@@ -235,7 +235,7 @@ public class NetconfDeviceProvider extends AbstractProvider ...@@ -235,7 +235,7 @@ public class NetconfDeviceProvider extends AbstractProvider
235 235
236 @Override 236 @Override
237 public void event(NetworkConfigEvent event) { 237 public void event(NetworkConfigEvent event) {
238 - executor.submit(NetconfDeviceProvider.this::connectDevices); 238 + executor.execute(NetconfDeviceProvider.this::connectDevices);
239 } 239 }
240 240
241 @Override 241 @Override
......
...@@ -70,7 +70,7 @@ class TopologyMutationDriver implements Runnable { ...@@ -70,7 +70,7 @@ class TopologyMutationDriver implements Runnable {
70 private List<LinkDescription> inactiveLinks; 70 private List<LinkDescription> inactiveLinks;
71 71
72 private final ExecutorService executor = 72 private final ExecutorService executor =
73 - newSingleThreadScheduledExecutor(groupedThreads("onos/null", "topo-mutator")); 73 + newSingleThreadScheduledExecutor(groupedThreads("onos/null", "topo-mutator", log));
74 74
75 private Map<DeviceId, Set<Link>> savedLinks = Maps.newConcurrentMap(); 75 private Map<DeviceId, Set<Link>> savedLinks = Maps.newConcurrentMap();
76 76
...@@ -99,7 +99,7 @@ class TopologyMutationDriver implements Runnable { ...@@ -99,7 +99,7 @@ class TopologyMutationDriver implements Runnable {
99 activeLinks = reduceLinks(); 99 activeLinks = reduceLinks();
100 inactiveLinks = Lists.newArrayList(); 100 inactiveLinks = Lists.newArrayList();
101 adjustRate(mutationRate); 101 adjustRate(mutationRate);
102 - executor.submit(this); 102 + executor.execute(this);
103 } 103 }
104 104
105 /** 105 /**
......
...@@ -106,7 +106,7 @@ public class RestDeviceProvider extends AbstractProvider ...@@ -106,7 +106,7 @@ public class RestDeviceProvider extends AbstractProvider
106 private static final String UNKNOWN = "unknown"; 106 private static final String UNKNOWN = "unknown";
107 107
108 private final ExecutorService executor = 108 private final ExecutorService executor =
109 - Executors.newFixedThreadPool(5, groupedThreads("onos/restsbprovider", "device-installer-%d")); 109 + Executors.newFixedThreadPool(5, groupedThreads("onos/restsbprovider", "device-installer-%d", log));
110 110
111 private final ConfigFactory factory = 111 private final ConfigFactory factory =
112 new ConfigFactory<ApplicationId, RestProviderConfig>(APP_SUBJECT_FACTORY, 112 new ConfigFactory<ApplicationId, RestProviderConfig>(APP_SUBJECT_FACTORY,
...@@ -279,7 +279,7 @@ public class RestDeviceProvider extends AbstractProvider ...@@ -279,7 +279,7 @@ public class RestDeviceProvider extends AbstractProvider
279 279
280 @Override 280 @Override
281 public void event(NetworkConfigEvent event) { 281 public void event(NetworkConfigEvent event) {
282 - executor.submit(RestDeviceProvider.this::connectDevices); 282 + executor.execute(RestDeviceProvider.this::connectDevices);
283 } 283 }
284 284
285 @Override 285 @Override
......
...@@ -92,7 +92,7 @@ public class SnmpDeviceProvider extends AbstractProvider ...@@ -92,7 +92,7 @@ public class SnmpDeviceProvider extends AbstractProvider
92 protected ComponentConfigService cfgService; 92 protected ComponentConfigService cfgService;
93 93
94 private final ExecutorService deviceBuilder = Executors 94 private final ExecutorService deviceBuilder = Executors
95 - .newFixedThreadPool(1, groupedThreads("onos/snmp", "device-creator")); 95 + .newFixedThreadPool(1, groupedThreads("onos/snmp", "device-creator", log));
96 96
97 // Delay between events in ms. 97 // Delay between events in ms.
98 private static final int EVENTINTERVAL = 5; 98 private static final int EVENTINTERVAL = 5;
...@@ -140,7 +140,7 @@ public class SnmpDeviceProvider extends AbstractProvider ...@@ -140,7 +140,7 @@ public class SnmpDeviceProvider extends AbstractProvider
140 try { 140 try {
141 snmpDeviceMap 141 snmpDeviceMap
142 .entrySet().stream().forEach((deviceEntry) -> { 142 .entrySet().stream().forEach((deviceEntry) -> {
143 - deviceBuilder.submit(new DeviceCreator(deviceEntry.getValue(), false)); 143 + deviceBuilder.execute(new DeviceCreator(deviceEntry.getValue(), false));
144 }); 144 });
145 deviceBuilder.awaitTermination(1000, TimeUnit.MILLISECONDS); 145 deviceBuilder.awaitTermination(1000, TimeUnit.MILLISECONDS);
146 } catch (InterruptedException e) { 146 } catch (InterruptedException e) {
...@@ -184,9 +184,9 @@ public class SnmpDeviceProvider extends AbstractProvider ...@@ -184,9 +184,9 @@ public class SnmpDeviceProvider extends AbstractProvider
184 device.getDeviceState().name()} 184 device.getDeviceState().name()}
185 ); 185 );
186 if (device.isActive()) { 186 if (device.isActive()) {
187 - deviceBuilder.submit(new DeviceCreator(device, true)); 187 + deviceBuilder.execute(new DeviceCreator(device, true));
188 } else { 188 } else {
189 - deviceBuilder.submit(new DeviceCreator(device, false)); 189 + deviceBuilder.execute(new DeviceCreator(device, false));
190 } 190 }
191 } 191 }
192 } 192 }
......