mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-04 19:56:49 +02:00
Code Issues Projects Releases Wiki Activity

Bug Fixes and improvements to P4Runtime subsystem

Browse Source 
Change-Id: Ib18b08e5e4b4d552949b119d7b1201dd4ca616f6
This commit is contained in:
Andrea Campanella 2018-05-15 16:45:00 +02:00 committed by Carmelo Cascone
parent cf03a0fafd
commit a74bdba108
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
protocols/grpc/ctl/src/main/java/org/onosproject/grpc/ctl/GrpcControllerImpl.java
View File

@ -34,17 +34,25 @@ import io.grpc.StatusRuntimeException;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.grpc.api.GrpcChannelId;
import org.onosproject.grpc.api.GrpcController;
import org.onosproject.grpc.ctl.dummy.Dummy;
import org.onosproject.grpc.ctl.dummy.DummyServiceGrpc;
import org.onosproject.net.DeviceId;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Collection;
import java.util.Dictionary;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
@ -63,9 +71,17 @@ import static com.google.common.base.Preconditions.checkNotNull;
@Service
public class GrpcControllerImpl implements GrpcController {
// Hint: set to true to log all gRPC messages received/sent on all channels.
// TODO: make configurable at runtime
public static boolean enableMessageLog = false;
private static final String SET_FORWARDING_PIPELINE_CONFIG_METHOD = "p4.P4Runtime/SetForwardingPipelineConfig";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ComponentConfigService componentConfigService;
// Hint: set to true to log all gRPC messages received/sent on all channels
// Does not enable log on existing channels
private static final boolean DEFAULT_LOG_LEVEL = false;
@Property(name = "enableMessageLog", boolValue = DEFAULT_LOG_LEVEL,
label = "Indicates whether to log all gRPC messages sent and received on all channels")
public static boolean enableMessageLog = DEFAULT_LOG_LEVEL;
private final Logger log = LoggerFactory.getLogger(getClass());
@ -74,12 +90,24 @@ public class GrpcControllerImpl implements GrpcController {
@Activate
public void activate() {
componentConfigService.registerProperties(getClass());
channels = new ConcurrentHashMap<>();
log.info("Started");
}
@Modified
public void modified(ComponentContext context) {
if (context != null) {
Dictionary<?, ?> properties = context.getProperties();
enableMessageLog = Tools.isPropertyEnabled(properties, "enableMessageLog",
DEFAULT_LOG_LEVEL);
log.info("Configured. Log of gRPC messages is {}", enableMessageLog ? "enabled" : "disabled");
}
}
@Deactivate
public void deactivate() {
componentConfigService.unregisterProperties(getClass(), false);
channels.values().forEach(ManagedChannel::shutdown);
channels.clear();
log.info("Stopped");
@ -96,9 +124,7 @@ public class GrpcControllerImpl implements GrpcController {
lock.lock();
try {
if (enableMessageLog) {
channelBuilder.intercept(new InternalLogChannelInterceptor(channelId));
}
channelBuilder.intercept(new InternalLogChannelInterceptor(channelId));
ManagedChannel channel = channelBuilder.build();
// Forced connection not yet implemented. Use workaround...
// channel.getState(true);
@ -175,6 +201,7 @@ public class GrpcControllerImpl implements GrpcController {
}
channels.remove(channelId);
channelLocks.remove(channelId);
} finally {
lock.unlock();
}
@ -232,9 +259,12 @@ public class GrpcControllerImpl implements GrpcController {
@Override
public void sendMessage(ReqT message) {
log.info("*** SENDING GRPC MESSAGE [{}]\n{}:\n{}",
channelId, methodDescriptor.getFullMethodName(),
message.toString());
if (enableMessageLog && !methodDescriptor.getFullMethodName()
.startsWith(SET_FORWARDING_PIPELINE_CONFIG_METHOD)) {
log.info("*** SENDING GRPC MESSAGE [{}]\n{}:\n{}",
channelId, methodDescriptor.getFullMethodName(),
message.toString());
}
super.sendMessage(message);
}
@ -249,9 +279,11 @@ public class GrpcControllerImpl implements GrpcController {
@Override
public void onMessage(RespT message) {
log.info("*** RECEIVED GRPC MESSAGE [{}]\n{}:\n{}",
channelId, methodDescriptor.getFullMethodName(),
message.toString());
if (enableMessageLog) {
log.info("*** RECEIVED GRPC MESSAGE [{}]\n{}:\n{}",
channelId, methodDescriptor.getFullMethodName(),
message.toString());
}
super.onMessage(message);
}
};

3
protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeControllerImpl.java
View File

@ -168,13 +168,12 @@ public class P4RuntimeControllerImpl
channelIds.remove(deviceId);
}
} finally {
deviceLocks.getUnchecked(deviceId).writeLock().lock();
deviceLocks.getUnchecked(deviceId).writeLock().unlock();
}
}
@Override
public boolean hasClient(DeviceId deviceId) {
deviceLocks.getUnchecked(deviceId).readLock().lock();
try {