Jdurham2843 commented on code in PR #1471:
URL: https://github.com/apache/solr/pull/1471#discussion_r1157918376
##########
solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java:
##########
@@ -1764,96 +1767,55 @@ public Map<String, Object> execute(
(req, rsp, h) -> {
req.getParams().required().check(COLLECTION_PROP,
CoreAdminParams.COMMIT_NAME);
- String extCollectionName = req.getParams().get(COLLECTION_PROP);
- boolean followAliases = req.getParams().getBool(FOLLOW_ALIASES,
false);
- String collectionName =
- followAliases
- ? h.coreContainer
- .getZkController()
- .getZkStateReader()
- .getAliases()
- .resolveSimpleAlias(extCollectionName)
- : extCollectionName;
- String commitName = req.getParams().get(CoreAdminParams.COMMIT_NAME);
- ClusterState clusterState =
h.coreContainer.getZkController().getClusterState();
- if (!clusterState.hasCollection(collectionName)) {
- throw new SolrException(
- ErrorCode.BAD_REQUEST,
- "Collection '" + collectionName + "' does not exist, no action
taken.");
- }
+ final String extCollectionName =
req.getParams().get(COLLECTION_PROP);
+ final boolean followAliases =
req.getParams().getBool(FOLLOW_ALIASES, false);
+ final String commitName =
req.getParams().get(CoreAdminParams.COMMIT_NAME);
+ final String asyncId = req.getParams().get(ASYNC);
- SolrZkClient client =
h.coreContainer.getZkController().getZkClient();
- if (SolrSnapshotManager.snapshotExists(client, collectionName,
commitName)) {
- throw new SolrException(
- ErrorCode.BAD_REQUEST,
- "Snapshot with name '"
- + commitName
- + "' already exists for collection '"
- + collectionName
- + "', no action taken.");
- }
+ final CreateCollectionSnapshotAPI createCollectionSnapshotAPI =
+ new CreateCollectionSnapshotAPI(h.coreContainer, req, rsp);
- Map<String, Object> params =
- copy(
- req.getParams(),
- null,
- COLLECTION_PROP,
- FOLLOW_ALIASES,
- CoreAdminParams.COMMIT_NAME);
- return params;
+ final CreateCollectionSnapshotAPI.CreateSnapshotResponse
createSnapshotResponse =
+ createCollectionSnapshotAPI.createSnapshot(
+ extCollectionName, commitName, followAliases, asyncId);
+
+ V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp,
createSnapshotResponse);
+
+ return null;
}),
DELETESNAPSHOT_OP(
DELETESNAPSHOT,
(req, rsp, h) -> {
req.getParams().required().check(COLLECTION_PROP,
CoreAdminParams.COMMIT_NAME);
- String extCollectionName = req.getParams().get(COLLECTION_PROP);
- String collectionName =
- h.coreContainer
- .getZkController()
- .getZkStateReader()
- .getAliases()
- .resolveSimpleAlias(extCollectionName);
- ClusterState clusterState =
h.coreContainer.getZkController().getClusterState();
- if (!clusterState.hasCollection(collectionName)) {
- throw new SolrException(
- ErrorCode.BAD_REQUEST,
- "Collection '" + collectionName + "' does not exist, no action
taken.");
- }
+ final String extCollectionName =
req.getParams().get(COLLECTION_PROP);
+ final String commitName =
req.getParams().get(CoreAdminParams.COMMIT_NAME);
+ final boolean followAliases =
req.getParams().getBool(FOLLOW_ALIASES, false);
+ final String asyncId = req.getParams().get(ASYNC);
- Map<String, Object> params =
- copy(
- req.getParams(),
- null,
- COLLECTION_PROP,
- FOLLOW_ALIASES,
- CoreAdminParams.COMMIT_NAME);
- return params;
+ final DeleteCollectionSnapshotAPI deleteCollectionSnapshotAPI =
+ new DeleteCollectionSnapshotAPI(h.coreContainer, req, rsp);
+
+ final DeleteCollectionSnapshotAPI.DeleteSnapshotResponse
deleteSnapshotResponse =
+ deleteCollectionSnapshotAPI.deleteSnapshot(
+ extCollectionName, commitName, followAliases, asyncId);
+
+ V2ApiUtils.squashIntoSolrResponseWithoutHeader(rsp,
deleteSnapshotResponse);
+ return null;
}),
LISTSNAPSHOTS_OP(
LISTSNAPSHOTS,
(req, rsp, h) -> {
req.getParams().required().check(COLLECTION_PROP);
- String extCollectionName = req.getParams().get(COLLECTION_PROP);
- String collectionName =
- h.coreContainer
- .getZkController()
- .getZkStateReader()
- .getAliases()
- .resolveSimpleAlias(extCollectionName);
- ClusterState clusterState =
h.coreContainer.getZkController().getClusterState();
- if (!clusterState.hasCollection(collectionName)) {
- throw new SolrException(
- ErrorCode.BAD_REQUEST,
- "Collection '" + collectionName + "' does not exist, no action
taken.");
- }
+ final ListCollectionSnapshotsAPI listCollectionSnapshotsAPI =
+ new ListCollectionSnapshotsAPI(h.coreContainer, req, rsp);
+
+ final ListCollectionSnapshotsAPI.ListSnapshotsResponse response =
+
listCollectionSnapshotsAPI.listSnapshots(req.getParams().get(COLLECTION_PROP));
- NamedList<Object> snapshots = new NamedList<Object>();
- SolrZkClient client =
h.coreContainer.getZkController().getZkClient();
- Collection<CollectionSnapshotMetaData> m =
- SolrSnapshotManager.listSnapshots(client, collectionName);
- for (CollectionSnapshotMetaData meta : m) {
+ NamedList<Object> snapshots = new NamedList<>();
+ for (CollectionSnapshotMetaData meta : response.snapshots.values()) {
Review Comment:
I used the approach above, because when I tried just squashing, the output I
got back wouldn't fully serialize. I essentially would get this back:
```{
"responseHeader": {
"status": 0,
"QTime": 14
},
"snapshots": {
"snapshot2":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@24e1513a",
"snapshot1":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@50d291df",
"snapshot9":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@55cf09d4",
"snapshot8":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@542b33e3",
"snapshot7":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@7a6dd0dd",
"snapshot6":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@3ef5ea26",
"snapshot5":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@13d9d585",
"snapshot10":
"org.apache.solr.core.snapshots.CollectionSnapshotMetaData:org.apache.solr.core.snapshots.CollectionSnapshotMetaData@1e604836"
}
}
```
At the time, I couldn't figure out where to make changes to address the
serialization problem, so I just sidestepped it. I'd be happy to take another
stab at it though!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
