Committed by
Gerrit Code Review
Update StorageManager.getPartitionInfo() to delegate to PartitionAdminService.partitionInfo()
Change-Id: I20aa9f986874e6ac7c602b8ae58b7c7b0df9a835
Showing
2 changed files
with
8 additions
and
4 deletions
... | @@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.JsonNode; | ... | @@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.JsonNode; |
26 | import com.fasterxml.jackson.databind.ObjectMapper; | 26 | import com.fasterxml.jackson.databind.ObjectMapper; |
27 | import com.fasterxml.jackson.databind.node.ArrayNode; | 27 | import com.fasterxml.jackson.databind.node.ArrayNode; |
28 | import com.fasterxml.jackson.databind.node.ObjectNode; | 28 | import com.fasterxml.jackson.databind.node.ObjectNode; |
29 | +import com.google.common.collect.Ordering; | ||
29 | 30 | ||
30 | /** | 31 | /** |
31 | * Command to list the database partitions in the system. | 32 | * Command to list the database partitions in the system. |
... | @@ -48,7 +49,7 @@ public class PartitionsListCommand extends AbstractShellCommand { | ... | @@ -48,7 +49,7 @@ public class PartitionsListCommand extends AbstractShellCommand { |
48 | 49 | ||
49 | for (PartitionInfo info : partitionInfo) { | 50 | for (PartitionInfo info : partitionInfo) { |
50 | boolean first = true; | 51 | boolean first = true; |
51 | - for (String member : info.members()) { | 52 | + for (String member : Ordering.natural().sortedCopy(info.members())) { |
52 | if (first) { | 53 | if (first) { |
53 | print(FMT, info.name(), info.term(), member, | 54 | print(FMT, info.name(), info.term(), member, |
54 | member.equals(info.leader()) ? "*" : ""); | 55 | member.equals(info.leader()) ? "*" : ""); | ... | ... |
... | @@ -37,6 +37,7 @@ import org.onosproject.persistence.PersistenceService; | ... | @@ -37,6 +37,7 @@ import org.onosproject.persistence.PersistenceService; |
37 | import org.onosproject.store.cluster.messaging.ClusterCommunicationService; | 37 | import org.onosproject.store.cluster.messaging.ClusterCommunicationService; |
38 | import org.onosproject.store.primitives.DistributedPrimitiveCreator; | 38 | import org.onosproject.store.primitives.DistributedPrimitiveCreator; |
39 | import org.onosproject.store.primitives.MapUpdate; | 39 | import org.onosproject.store.primitives.MapUpdate; |
40 | +import org.onosproject.store.primitives.PartitionAdminService; | ||
40 | import org.onosproject.store.primitives.PartitionService; | 41 | import org.onosproject.store.primitives.PartitionService; |
41 | import org.onosproject.store.primitives.TransactionId; | 42 | import org.onosproject.store.primitives.TransactionId; |
42 | import org.onosproject.store.serializers.KryoNamespaces; | 43 | import org.onosproject.store.serializers.KryoNamespaces; |
... | @@ -57,7 +58,6 @@ import org.onosproject.store.service.StorageService; | ... | @@ -57,7 +58,6 @@ import org.onosproject.store.service.StorageService; |
57 | import org.onosproject.store.service.TransactionContextBuilder; | 58 | import org.onosproject.store.service.TransactionContextBuilder; |
58 | import org.slf4j.Logger; | 59 | import org.slf4j.Logger; |
59 | 60 | ||
60 | -import com.google.common.collect.Lists; | ||
61 | import com.google.common.collect.Maps; | 61 | import com.google.common.collect.Maps; |
62 | import com.google.common.util.concurrent.Futures; | 62 | import com.google.common.util.concurrent.Futures; |
63 | 63 | ||
... | @@ -82,6 +82,9 @@ public class StorageManager implements StorageService, StorageAdminService { | ... | @@ -82,6 +82,9 @@ public class StorageManager implements StorageService, StorageAdminService { |
82 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) | 82 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
83 | protected PartitionService partitionService; | 83 | protected PartitionService partitionService; |
84 | 84 | ||
85 | + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) | ||
86 | + protected PartitionAdminService partitionAdminService; | ||
87 | + | ||
85 | private final Supplier<TransactionId> transactionIdGenerator = | 88 | private final Supplier<TransactionId> transactionIdGenerator = |
86 | () -> TransactionId.from(UUID.randomUUID().toString()); | 89 | () -> TransactionId.from(UUID.randomUUID().toString()); |
87 | private DistributedPrimitiveCreator basePrimitiveCreator; | 90 | private DistributedPrimitiveCreator basePrimitiveCreator; |
... | @@ -198,7 +201,7 @@ public class StorageManager implements StorageService, StorageAdminService { | ... | @@ -198,7 +201,7 @@ public class StorageManager implements StorageService, StorageAdminService { |
198 | 201 | ||
199 | @Override | 202 | @Override |
200 | public List<PartitionInfo> getPartitionInfo() { | 203 | public List<PartitionInfo> getPartitionInfo() { |
201 | - return Lists.newArrayList(); | 204 | + return partitionAdminService.partitionInfo(); |
202 | } | 205 | } |
203 | 206 | ||
204 | @Override | 207 | @Override |
... | @@ -217,4 +220,4 @@ public class StorageManager implements StorageService, StorageAdminService { | ... | @@ -217,4 +220,4 @@ public class StorageManager implements StorageService, StorageAdminService { |
217 | return new MapInfo(name, map.size()); | 220 | return new MapInfo(name, map.size()); |
218 | }).collect(Collectors.toList()); | 221 | }).collect(Collectors.toList()); |
219 | } | 222 | } |
220 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
223 | +} | ... | ... |
-
Please register or login to post a comment