-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix/8493-systemd-service-file-for-debian
- Loading branch information
Showing
12 changed files
with
394 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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.elasticsearch.action.admin.cluster.node.liveness; | ||
|
|
||
| import org.elasticsearch.action.ActionRequest; | ||
| import org.elasticsearch.action.ActionRequestValidationException; | ||
|
|
||
| /** | ||
| * Transport level private response for the transport handler registered under | ||
| * {@value org.elasticsearch.action.admin.cluster.node.liveness.TransportLivenessAction#NAME} | ||
| */ | ||
| public final class LivenessRequest extends ActionRequest<LivenessRequest> { | ||
| @Override | ||
| public ActionRequestValidationException validate() { | ||
| return null; | ||
| } | ||
| } |
72 changes: 72 additions & 0 deletions
72
src/main/java/org/elasticsearch/action/admin/cluster/node/liveness/LivenessResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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.elasticsearch.action.admin.cluster.node.liveness; | ||
|
|
||
| import org.elasticsearch.action.ActionResponse; | ||
| import org.elasticsearch.cluster.ClusterName; | ||
| import org.elasticsearch.cluster.node.DiscoveryNode; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.common.io.stream.StreamOutput; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Transport level private response for the transport handler registered under | ||
| * {@value org.elasticsearch.action.admin.cluster.node.liveness.TransportLivenessAction#NAME} | ||
| */ | ||
| public final class LivenessResponse extends ActionResponse { | ||
|
|
||
| private DiscoveryNode node; | ||
| private ClusterName clusterName; | ||
|
|
||
| public LivenessResponse() { | ||
| } | ||
|
|
||
| public LivenessResponse(ClusterName clusterName, DiscoveryNode node) { | ||
| this.node = node; | ||
| this.clusterName = clusterName; | ||
| } | ||
|
|
||
| @Override | ||
| public void readFrom(StreamInput in) throws IOException { | ||
| super.readFrom(in); | ||
| clusterName = ClusterName.readClusterName(in); | ||
| if (in.readBoolean()) { | ||
| node = DiscoveryNode.readNode(in); | ||
| } else { | ||
| node = null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| super.writeTo(out); | ||
| clusterName.writeTo(out); | ||
| out.writeOptionalStreamable(node); | ||
| } | ||
|
|
||
| public ClusterName getClusterName() { | ||
| return clusterName; | ||
| } | ||
|
|
||
| public DiscoveryNode getDiscoveryNode() { | ||
| return node; | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
...in/java/org/elasticsearch/action/admin/cluster/node/liveness/TransportLivenessAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch 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.elasticsearch.action.admin.cluster.node.liveness; | ||
|
|
||
| import org.elasticsearch.cluster.ClusterName; | ||
| import org.elasticsearch.cluster.ClusterService; | ||
| import org.elasticsearch.common.inject.Inject; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.threadpool.ThreadPool; | ||
| import org.elasticsearch.transport.*; | ||
|
|
||
| public final class TransportLivenessAction extends BaseTransportRequestHandler<LivenessRequest> { | ||
|
|
||
| private final ClusterService clusterService; | ||
| private final ClusterName clusterName; | ||
| public static final String NAME = "cluster:monitor/nodes/liveness"; | ||
|
|
||
| @Inject | ||
| public TransportLivenessAction(ClusterName clusterName, | ||
| ClusterService clusterService, TransportService transportService) { | ||
| this.clusterService = clusterService; | ||
| this.clusterName = clusterName; | ||
| transportService.registerHandler(NAME, this); | ||
| } | ||
|
|
||
| @Override | ||
| public LivenessRequest newInstance() { | ||
| return new LivenessRequest(); | ||
| } | ||
|
|
||
| @Override | ||
| public void messageReceived(LivenessRequest request, TransportChannel channel) throws Exception { | ||
| channel.sendResponse(new LivenessResponse(clusterName, clusterService.localNode())); | ||
| } | ||
|
|
||
| @Override | ||
| public String executor() { | ||
| return ThreadPool.Names.SAME; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.