dsmiley commented on code in PR #4046:
URL: https://github.com/apache/solr/pull/4046#discussion_r2689053231
##########
solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java:
##########
@@ -415,6 +420,25 @@ protected static CoreStatusResponse.SingleCoreData
getCoreStatus(Replica replica
}
}
+ protected CollectionAdminRequest.RequestStatusResponse
waitForAsyncClusterRequest(
+ String asyncId, Duration timeout)
+ throws SolrServerException, IOException, InterruptedException {
+ CollectionAdminRequest.RequestStatus requestStatus =
+ CollectionAdminRequest.requestStatus(asyncId);
+ CollectionAdminRequest.RequestStatusResponse rsp = null;
+ TimeOut timeoutCheck = new TimeOut(timeout, TimeSource.NANO_TIME);
Review Comment:
hmm; we also have org.apache.solr.common.util.RetryUtil utility. Maybe that
should at least cross-link.
##########
solr/core/src/test/org/apache/solr/handler/admin/api/MockAPITest.java:
##########
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.solr.handler.admin.api;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import io.opentelemetry.api.trace.Span;
+import java.util.Optional;
+import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.cloud.OverseerSolrResponse;
+import org.apache.solr.cloud.ZkController;
+import org.apache.solr.cloud.api.collections.AdminCmdContext;
+import
org.apache.solr.cloud.api.collections.DistributedCollectionConfigSetCommandRunner;
+import org.apache.solr.common.cloud.Aliases;
+import org.apache.solr.common.cloud.ClusterState;
+import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.cloud.ZkNodeProps;
+import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.core.CoreContainer;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.mockito.ArgumentCaptor;
+
+/**
+ * Abstract test class to setup shared mocks for unit testing v2 API calls
that go to the Overseer.
Review Comment:
false
##########
gradle/validation/validate-source-patterns.gradle:
##########
Review Comment:
slipped in accidentally?
##########
solr/core/src/test/org/apache/solr/handler/admin/api/MockAPITest.java:
##########
Review Comment:
Based on the content here, this seems actually for SolrCloud. If so; maybe
the name or package should reflect that. Any way, this class is peculiar to me.
##########
solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java:
##########
Review Comment:
What's this about?
##########
solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java:
##########
@@ -359,14 +357,17 @@ public static SolrResponse submitCollectionApiCommand(
Optional<DistributedCollectionConfigSetCommandRunner> distribCommandRunner
=
zkController.getDistributedCommandRunner();
if (distribCommandRunner.isPresent()) {
- return distribCommandRunner.get().runCollectionCommand(m, action,
timeout);
+ return distribCommandRunner.get().runCollectionCommand(adminCmdContext,
m, timeout);
} else { // Sending the Collection API message to Overseer via a Zookeeper
queue
- String operation = m.getStr(QUEUE_OPERATION);
- if (operation == null) {
- throw new SolrException(ErrorCode.BAD_REQUEST, "missing key " +
QUEUE_OPERATION);
+ String operation = adminCmdContext.getAction().lowerName;
+ HashMap<String, Object> additionalProps = new HashMap<>();
+ additionalProps.put(QUEUE_OPERATION, operation);
+ if (adminCmdContext.getAsyncId() != null &&
!adminCmdContext.getAsyncId().isBlank()) {
Review Comment:
Is this the right place for input validation (isBlank) -- are we close the
the point of API entry for that? I don't link isBlank and similar beyond the
front door.
##########
solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java:
##########
@@ -415,6 +420,25 @@ protected static CoreStatusResponse.SingleCoreData
getCoreStatus(Replica replica
}
}
+ protected CollectionAdminRequest.RequestStatusResponse
waitForAsyncClusterRequest(
+ String asyncId, Duration timeout)
Review Comment:
`timeoutNs` please
--
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]
