diff --git a/changelog/unreleased/SOLR-18417-deprecate-pingrequesthandler.yml b/changelog/unreleased/SOLR-18417-deprecate-pingrequesthandler.yml
new file mode 100644
index 000000000000..fb82ab8f6d1f
--- /dev/null
+++ b/changelog/unreleased/SOLR-18417-deprecate-pingrequesthandler.yml
@@ -0,0 +1,7 @@
+type: deprecated
+title: Deprecate PingRequestHandler (the "/admin/ping" endpoint), SolrPing, SolrPingResponse, and SolrClient.ping()/ping(String).
+authors:
+ - name: Jason Gerlowski
+links:
+ - name: SOLR-18417
+ url: https://issues.apache.org/jira/browse/SOLR-18417
diff --git a/changelog/unreleased/SOLR-18417-remove-pingrequesthandler.yml b/changelog/unreleased/SOLR-18417-remove-pingrequesthandler.yml
new file mode 100644
index 000000000000..ad7f8392629f
--- /dev/null
+++ b/changelog/unreleased/SOLR-18417-remove-pingrequesthandler.yml
@@ -0,0 +1,7 @@
+type: removed
+title: `PingRequestHandler` (the "/admin/ping" endpoint), `SolrPing`, `SolrPingResponse`, and `SolrClient.ping()` have been removed. Users looking for a healthcheck API can use `/api/node/health` (v2) or `/solr/admin/info/health` (v1) instead. SolrJ users looking to replace "ping" functionality can either use `QueryRequest` for true query submission, or `HealthCheckRequest` for making a node-level healthcheck request.
+authors:
+ - name: Jason Gerlowski
+links:
+ - name: SOLR-18417
+ url: https://issues.apache.org/jira/browse/SOLR-18417
diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 64b288ab6add..69fc4ca5f987 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -35,6 +35,7 @@
import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest.WaitForState;
+import org.apache.solr.client.solrj.request.HealthCheckRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
@@ -824,7 +825,7 @@ private Replica pingLeader(String ourUrl, CoreDescriptor coreDesc, boolean mayPu
try (SolrClient httpSolrClient =
recoverySolrClientBuilder(leaderReplica.getBaseUrl(), leaderReplica.getCoreName())
.build()) {
- httpSolrClient.ping();
+ new HealthCheckRequest().process(httpSolrClient);
return leaderReplica;
} catch (IOException e) {
log.error("Failed to connect leader {} on recovery, try again", leaderReplica.getBaseUrl());
diff --git a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
deleted file mode 100644
index f7eaa97db78b..000000000000
--- a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * 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;
-
-import static org.apache.solr.common.params.CommonParams.ACTION;
-import static org.apache.solr.common.params.CommonParams.DISABLE;
-import static org.apache.solr.common.params.CommonParams.DISTRIB;
-import static org.apache.solr.common.params.CommonParams.ENABLE;
-
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.Instant;
-import java.util.Locale;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.params.ShardParams;
-import org.apache.solr.common.params.SolrParams;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.request.SolrRequestHandler;
-import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.security.AuthorizationContext;
-import org.apache.solr.util.plugin.SolrCoreAware;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Ping Request Handler for reporting SolrCore health to a Load Balancer.
- *
- *
This handler is designed to be used as the endpoint for an HTTP Load-Balancer to use when
- * checking the "health" or "up status" of a Solr server.
- *
- *
In its simplest form, the PingRequestHandler should be configured with some defaults
- * indicating a request that should be executed. If the request succeeds, then the
- * PingRequestHandler will respond back with a simple "OK" status. If the request fails, then the
- * PingRequestHandler will respond back with the corresponding HTTP Error code. Clients (such as
- * load balancers) can be configured to poll the PingRequestHandler monitoring for these types of
- * responses (or for a simple connection failure) to know if there is a problem with the Solr
- * server.
- *
- *
Note in case isShard=true, PingRequestHandler respond back with what the delegated handler
- * returns (by default it's /select handler).
- *
- *
A more advanced option available, is to configure the handler with a "healthcheckFile" which
- * can be used to enable/disable the PingRequestHandler.
- *
- *
- * <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
- * <!-- relative paths are resolved against the data dir -->
- * <str name="healthcheckFile">server-enabled.txt</str>
- * <lst name="invariants">
- * <str name="qt">/search</str><!-- handler to delegate to -->
- * <str name="q">some test query</str>
- * </lst>
- * </requestHandler>
- *
- *
- *
- *
If the health check file exists, the handler will execute the delegated query and return
- * status as described above.
- *
If the health check file does not exist, the handler will return an HTTP error even if the
- * server is working fine and the delegated query would have succeeded
- *
- *
- *
This health check file feature can be used as a way to indicate to some Load Balancers that
- * the server should be "removed from rotation" for maintenance, or upgrades, or whatever reason you
- * may wish.
- *
- *
The health check file may be created/deleted by any external system, or the PingRequestHandler
- * itself can be used to create/delete the file by specifying an "action" param in a request:
- *
- *
- *
http://.../ping?action=enable - creates the health check file if it does not
- * already exist
- *
http://.../ping?action=disable - deletes the health check file if it exists
- *
http://.../ping?action=status - returns a status code indicating if the
- * healthcheck file exists ("enabled") or not ("disabled")
- *
- *
- * @since solr 1.3
- */
-public class PingRequestHandler extends RequestHandlerBase implements SolrCoreAware {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- public static final String HEALTHCHECK_FILE_PARAM = "healthcheckFile";
-
- @Override
- public Name getPermissionName(AuthorizationContext request) {
- String action = request.getParams().get(ACTION, "").strip().toLowerCase(Locale.ROOT);
- // Modifying the health check file requires more permission than just doing a ping
- switch (action) {
- case ENABLE:
- case DISABLE:
- return Name.CONFIG_EDIT_PERM;
- default:
- return Name.HEALTH_PERM;
- }
- }
-
- protected enum ACTIONS {
- STATUS,
- ENABLE,
- DISABLE,
- PING
- };
-
- private String healthFileName = null;
- private Path healthcheck = null;
-
- @Override
- public void init(NamedList args) {
- super.init(args);
- Object tmp = args.get(HEALTHCHECK_FILE_PARAM);
- healthFileName = (null == tmp ? null : tmp.toString());
- }
-
- @Override
- public void inform(SolrCore core) {
- if (null != healthFileName) {
- healthcheck = Path.of(healthFileName);
- if (!healthcheck.isAbsolute()) {
- healthcheck = Path.of(core.getDataDir(), healthFileName);
- healthcheck = healthcheck.toAbsolutePath();
- }
-
- if (!Files.isWritable(healthcheck.getParent())) {
- // this is not fatal, users may not care about enable/disable via
- // solr request, file might be touched/deleted by an external system
- log.warn(
- "Directory for configured healthcheck file is not writable by solr, PingRequestHandler will not be able to control enable/disable: {}",
- healthcheck.getParent().toAbsolutePath());
- }
- }
- }
-
- /**
- * Returns true if the healthcheck flag-file is enabled but does not exist, otherwise (no file
- * configured, or file configured and exists) returns false.
- */
- public boolean isPingDisabled() {
- return (null != healthcheck && !Files.exists(healthcheck));
- }
-
- @Override
- public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
-
- SolrParams params = req.getParams();
-
- // in this case, we want to default distrib to false so
- // we only ping the single node
- Boolean distrib = params.getBool(DISTRIB);
- if (distrib == null) {
- ModifiableSolrParams mparams = new ModifiableSolrParams(params);
- mparams.set(DISTRIB, false);
- req.setParams(mparams);
- }
-
- String actionParam = params.get("action");
- ACTIONS action = null;
- if (actionParam == null) {
- action = ACTIONS.PING;
- } else {
- try {
- action = ACTIONS.valueOf(actionParam.toUpperCase(Locale.ROOT));
- } catch (IllegalArgumentException iae) {
- throw new SolrException(
- SolrException.ErrorCode.BAD_REQUEST, "Unknown action: " + actionParam);
- }
- }
- switch (action) {
- case PING:
- if (isPingDisabled()) {
- SolrException e =
- new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE, "Service disabled");
- rsp.setException(e);
- return;
- }
- handlePing(req, rsp);
- break;
- case ENABLE:
- handleEnable(true);
- break;
- case DISABLE:
- handleEnable(false);
- break;
- case STATUS:
- if (healthcheck == null) {
- SolrException e =
- new SolrException(
- SolrException.ErrorCode.SERVICE_UNAVAILABLE, "healthcheck not configured");
- rsp.setException(e);
- } else {
- rsp.add("status", isPingDisabled() ? "disabled" : "enabled");
- }
- }
- }
-
- protected void handlePing(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
-
- SolrParams params = req.getParams();
- SolrCore core = req.getCore();
-
- // Get the RequestHandler
- String qt = params.get(CommonParams.QT); // optional; you get the default otherwise
- SolrRequestHandler handler = core.getRequestHandler(qt);
- if (handler == null) {
- throw new SolrException(
- SolrException.ErrorCode.BAD_REQUEST, "Unknown RequestHandler (qt): " + qt);
- }
-
- if (handler instanceof PingRequestHandler) {
- // In case it's a query for shard, use default handler
- if (params.getBool(ShardParams.IS_SHARD, false)) {
- handler = core.getRequestHandler(null);
- ModifiableSolrParams wparams = new ModifiableSolrParams(params);
- wparams.remove(CommonParams.QT);
- req.setParams(wparams);
- } else {
- throw new SolrException(
- SolrException.ErrorCode.BAD_REQUEST,
- "Cannot execute the PingRequestHandler recursively");
- }
- }
-
- // Execute the ping query and catch any possible exception
- Throwable ex = null;
-
- // In case it's a query for shard, return the result from delegated handler for distributed
- // query to merge result
- if (params.getBool(ShardParams.IS_SHARD, false)) {
- try {
- core.execute(handler, req, rsp);
- ex = rsp.getException();
- } catch (Exception e) {
- ex = e;
- }
- // Send an error or return
- if (ex != null) {
- throw new SolrException(
- SolrException.ErrorCode.SERVER_ERROR,
- "Ping query caused exception: " + ex.getMessage(),
- ex);
- }
- } else {
- try {
- SolrQueryResponse pingrsp = new SolrQueryResponse();
- core.execute(handler, req, pingrsp);
- ex = pingrsp.getException();
- NamedList