Merged part of Flow related logging code
diff --git a/lib/blueprints-ramcloud-graph-2.4.0.jar b/lib/blueprints-ramcloud-graph-2.4.0.jar
deleted file mode 100644
index f796c94..0000000
--- a/lib/blueprints-ramcloud-graph-2.4.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/blueprints-ramcloud-graph-2.5.0.jar b/lib/blueprints-ramcloud-graph-2.5.0.jar
deleted file mode 100644
index 7d0080c..0000000
--- a/lib/blueprints-ramcloud-graph-2.5.0.jar
+++ /dev/null
Binary files differ
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index 9782a08..3205d6a 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -752,17 +752,27 @@
do {
retry = false;
try {
+ long startTime = System.nanoTime();
if (! FlowDatabaseOperation.addFlow(dbHandlerInner, flowPath)) {
String logMsg = "Cannot write to Network Map Flow Path " +
flowPath.flowId();
log.error(logMsg);
retry = true;
}
+ // FIXME Flag to turn ON logging
+ //long endTime = System.nanoTime();
+ //log.error("Performance %% Flow path total time {} : {}", endTime - startTime, flowPath.toString());
} catch (TitanException te) {
log.error("Titan Exception writing Flow Path to Network MAP: ", te);
retry = true;
+ // FIXME Flag to turn ON logging
+ //long endTime = System.nanoTime();
+ //log.error("Performance %% Flow path total time {} : {}", endTime - startTime, flowPath.toString());
} catch (Exception e) {
log.error("Exception writing Flow Path to Network MAP: ", e);
+ // FIXME Flag to turn ON logging
+ //long endTime = System.nanoTime();
+ //log.error("Performance %% Flow path total time {} : {}", endTime - startTime, flowPath.toString());
}
} while (retry);
}