From f17d173959fdb5582b460333d03237eb777f5bc7 Mon Sep 17 00:00:00 2001 From: Jordan Halterman Date: Mon, 30 Sep 2019 01:36:19 -0700 Subject: [PATCH] [AETHER-75] Add command to force snapshot of Raft partitions. Change-Id: I1e79967e3dcbf353749b6a1e524ce71c763ca588 --- .../cli/net/PartitionsSnapshotCommand.java | 47 +++++++++++++++++++ .../primitives/PartitionAdminService.java | 13 +++++ .../primitives/impl/PartitionManager.java | 19 ++++++++ 3 files changed, 79 insertions(+) create mode 100644 cli/src/main/java/org/onosproject/cli/net/PartitionsSnapshotCommand.java diff --git a/cli/src/main/java/org/onosproject/cli/net/PartitionsSnapshotCommand.java b/cli/src/main/java/org/onosproject/cli/net/PartitionsSnapshotCommand.java new file mode 100644 index 00000000000..02ecab376f8 --- /dev/null +++ b/cli/src/main/java/org/onosproject/cli/net/PartitionsSnapshotCommand.java @@ -0,0 +1,47 @@ +/* + * Copyright 2015-present Open Networking Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onosproject.cli.net; + +import org.apache.karaf.shell.api.action.Command; +import org.apache.karaf.shell.api.action.Option; +import org.apache.karaf.shell.api.action.lifecycle.Service; +import org.onosproject.cli.AbstractShellCommand; +import org.onosproject.cluster.PartitionId; +import org.onosproject.store.primitives.PartitionAdminService; + +/** + * Command to force a snapshot of the partitions. + */ +@Service +@Command(scope = "onos", name = "snapshot-partitions", + description = "Force snapshot partitions") +public class PartitionsSnapshotCommand extends AbstractShellCommand { + + @Option(name = "-p", aliases = "--partition", + description = "The partition to snapshot", + required = false, multiValued = false) + private Integer partitionId; + + @Override + protected void doExecute() { + PartitionAdminService partitionAdminService = get(PartitionAdminService.class); + if (partitionId != null) { + partitionAdminService.snapshot(PartitionId.from(partitionId)); + } else { + partitionAdminService.snapshot(); + } + } +} diff --git a/core/api/src/main/java/org/onosproject/store/primitives/PartitionAdminService.java b/core/api/src/main/java/org/onosproject/store/primitives/PartitionAdminService.java index 36029307911..d54dcf00142 100644 --- a/core/api/src/main/java/org/onosproject/store/primitives/PartitionAdminService.java +++ b/core/api/src/main/java/org/onosproject/store/primitives/PartitionAdminService.java @@ -17,6 +17,7 @@ import java.util.List; +import org.onosproject.cluster.PartitionId; import org.onosproject.store.service.PartitionClientInfo; import org.onosproject.store.service.PartitionInfo; @@ -36,4 +37,16 @@ public interface PartitionAdminService { * @return list of {@code PartitionClientInfo} */ List partitionClientInfo(); + + /** + * Takes a snapshot of all partitions. + */ + void snapshot(); + + /** + * Takes a snapshot of the given partition. + * + * @param partitionId the partition to snapshot + */ + void snapshot(PartitionId partitionId); } \ No newline at end of file diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/PartitionManager.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/PartitionManager.java index 0e6c11c4276..c6a2e75cf90 100644 --- a/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/PartitionManager.java +++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/PartitionManager.java @@ -124,4 +124,23 @@ public List partitionClientInfo() { .collect(Collectors.toList()))) .collect(Collectors.toList()); } + + @Override + public void snapshot() { + checkPermission(PARTITION_READ); + if (partitionGroup != null) { + partitionGroup.snapshot().join(); + } + } + + @Override + public void snapshot(PartitionId partitionId) { + checkPermission(PARTITION_READ); + io.atomix.primitive.partition.PartitionId atomixPartitionId = + io.atomix.primitive.partition.PartitionId.from(partitionGroup.name(), partitionId.id()); + if (partitionGroup != null && + partitionGroup.getPartition(atomixPartitionId) != null) { + partitionGroup.snapshot(atomixPartitionId).join(); + } + } }