New partitions cli option for displaying client information
Change-Id: Iba0a9f7ea809368bf0965b44d8ff60e7486ee3d8
diff --git a/cli/src/main/java/org/onosproject/cli/net/PartitionsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/PartitionsListCommand.java
index 32a7452..9fb92db 100644
--- a/cli/src/main/java/org/onosproject/cli/net/PartitionsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/PartitionsListCommand.java
@@ -18,7 +18,13 @@
import java.util.List;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Option;
import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.store.primitives.PartitionAdminService;
+import org.onosproject.store.service.PartitionClientInfo;
import org.onosproject.store.service.PartitionInfo;
import org.onosproject.store.service.StorageAdminService;
@@ -35,7 +41,13 @@
description = "Lists information about partitions in the system")
public class PartitionsListCommand extends AbstractShellCommand {
- private static final String FMT = "%-20s %8s %25s %s";
+ @Option(name = "-c", aliases = "--clients",
+ description = "Show inforamtion about partition clients",
+ required = false, multiValued = false)
+ private boolean reportClientInfo = false;
+
+ private static final String SERVER_FMT = "%-20s %8s %25s %s";
+ private static final String CLIENT_FMT = "%-20s %8s %10s %25s";
/**
* Displays partition info as text.
@@ -47,18 +59,18 @@
return;
}
print("----------------------------------------------------------");
- print(FMT, "Name", "Term", "Members", "");
+ print(SERVER_FMT, "Name", "Term", "Members", "");
print("----------------------------------------------------------");
for (PartitionInfo info : partitionInfo) {
boolean first = true;
for (String member : Ordering.natural().sortedCopy(info.members())) {
if (first) {
- print(FMT, info.name(), info.term(), member,
+ print(SERVER_FMT, info.name(), info.term(), member,
member.equals(info.leader()) ? "*" : "");
first = false;
} else {
- print(FMT, "", "", member,
+ print(SERVER_FMT, "", "", member,
member.equals(info.leader()) ? "*" : "");
}
}
@@ -69,6 +81,39 @@
}
/**
+ * Displays partition client info as text.
+ *
+ * @param partitionClientInfo partition client information
+ */
+ private void displayPartitionClients(List<PartitionClientInfo> partitionClientInfo) {
+ if (partitionClientInfo.isEmpty()) {
+ return;
+ }
+ ClusterService clusterService = get(ClusterService.class);
+ print("-------------------------------------------------------------------");
+ print(CLIENT_FMT, "Name", "SessionId", "Status", "Servers");
+ print("-------------------------------------------------------------------");
+
+ for (PartitionClientInfo info : partitionClientInfo) {
+ boolean first = true;
+ for (NodeId serverId : Ordering.natural().sortedCopy(info.servers())) {
+ ControllerNode server = clusterService.getNode(serverId);
+ String serverString = String.format("%s:%d", server.id(), server.tcpPort());
+ if (first) {
+ print(CLIENT_FMT, info.partitionId(), info.sessionId(),
+ info.status(), serverString);
+ first = false;
+ } else {
+ print(CLIENT_FMT, "", "", "", serverString);
+ }
+ }
+ if (!first) {
+ print("-------------------------------------------------------------------");
+ }
+ }
+ }
+
+ /**
* Converts partition info into a JSON object.
*
* @param partitionInfo partition descriptions
@@ -99,15 +144,58 @@
return partitions;
}
+ /**
+ * Converts partition client info into a JSON object.
+ *
+ * @param partitionClientInfo partition client descriptions
+ */
+ private JsonNode jsonForClientInfo(List<PartitionClientInfo> partitionClientInfo) {
+ ObjectMapper mapper = new ObjectMapper();
+ ArrayNode partitions = mapper.createArrayNode();
+ ClusterService clusterService = get(ClusterService.class);
+
+ // Create a JSON node for each partition client
+ partitionClientInfo.stream()
+ .forEach(info -> {
+ ObjectNode partition = mapper.createObjectNode();
+
+ // Add each member to the "servers" array for this partition
+ ArrayNode servers = partition.putArray("servers");
+ info.servers()
+ .stream()
+ .map(clusterService::getNode)
+ .map(node -> String.format("%s:%d", node.ip(), node.tcpPort()))
+ .forEach(servers::add);
+
+ // Complete the partition attributes and add it to the array
+ partition.put("partitionId", info.partitionId().toString())
+ .put("sessionId", info.sessionId())
+ .put("status", info.status().toString());
+ partitions.add(partition);
+
+ });
+
+ return partitions;
+ }
+
@Override
protected void execute() {
StorageAdminService storageAdminService = get(StorageAdminService.class);
- List<PartitionInfo> partitionInfo = storageAdminService.getPartitionInfo();
-
- if (outputJson()) {
- print("%s", json(partitionInfo));
+ if (reportClientInfo) {
+ PartitionAdminService partitionAdminService = get(PartitionAdminService.class);
+ List<PartitionClientInfo> partitionClientInfo = partitionAdminService.partitionClientInfo();
+ if (outputJson()) {
+ print("%s", jsonForClientInfo(partitionClientInfo));
+ } else {
+ displayPartitionClients(partitionClientInfo);
+ }
} else {
- displayPartitions(partitionInfo);
+ List<PartitionInfo> partitionInfo = storageAdminService.getPartitionInfo();
+ if (outputJson()) {
+ print("%s", json(partitionInfo));
+ } else {
+ displayPartitions(partitionInfo);
+ }
}
}
}