Github user revans2 commented on a diff in the pull request:
https://github.com/apache/storm/pull/1156#discussion_r54623619
--- Diff: storm-core/src/jvm/org/apache/storm/daemon/DrpcServer.java ---
@@ -0,0 +1,383 @@
+/**
+ * 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.storm.daemon;
+
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.ImmutableMap;
+import org.apache.commons.lang.StringUtils;
+import org.apache.storm.Config;
+import org.apache.storm.daemon.metrics.MetricsUtils;
+import org.apache.storm.daemon.metrics.reporters.PreparableReporter;
+import org.apache.storm.generated.*;
+import org.apache.storm.logging.ThriftAccessLogger;
+import org.apache.storm.security.auth.*;
+import org.apache.storm.security.auth.authorizer.DRPCAuthorizerBase;
+import org.apache.storm.ui.FilterConfiguration;
+import org.apache.storm.ui.IConfigurator;
+import org.apache.storm.ui.UIHelpers;
+import org.apache.storm.utils.Time;
+import org.apache.storm.utils.Utils;
+import org.apache.storm.utils.VersionInfo;
+import org.apache.thrift.TException;
+import org.eclipse.jetty.server.Server;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.Servlet;
+import java.security.Principal;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+public class DrpcServer implements DistributedRPC.Iface,
DistributedRPCInvocations.Iface, AutoCloseable {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(DrpcServer.class);
+ private final Long timeoutCheckSecs = 5L;
+
+ private Map conf;
+
+ private ThriftServer handlerServer;
+ private ThriftServer invokeServer;
+ private IHttpCredentialsPlugin httpCredsHandler;
+
+ private Thread clearThread;
+
+ private IAuthorizer authorizer;
+
+ //TODO: To be removed after porting drpc.clj
+ private Servlet httpServlet;
+
+ private AtomicInteger ctr = new AtomicInteger(0);
+ private ConcurrentHashMap<String, ConcurrentLinkedQueue<DRPCRequest>>
requestQueues = new ConcurrentHashMap<String,
ConcurrentLinkedQueue<DRPCRequest>>();
+
+ private static class InternalRequest {
+ public final Semaphore sem;
+ public final int startTimeSecs;
+ public final String function;
+ public final DRPCRequest request;
+ public volatile Object result;
+
+ public InternalRequest(String function, DRPCRequest request) {
+ sem = new Semaphore(0);
+ startTimeSecs = Time.currentTimeSecs();
+ this.function = function;
+ this.request = request;
+ }
+ }
+ private ConcurrentHashMap<String, InternalRequest> outstandingRequests
= new ConcurrentHashMap<>();
+
+
+ //TODO: to be replaced by a common registry
+ private final static Meter meterHttpRequests = new
MetricRegistry().meter("drpc:num-execute-http-requests");
+ private final static Meter meterExecuteCalls = new
MetricRegistry().meter("drpc:num-execute-calls");
+ private final static Meter meterResultCalls = new
MetricRegistry().meter("drpc:num-result-calls");
+ private final static Meter meterFailRequestCalls = new
MetricRegistry().meter("drpc:num-failRequest-calls");
+ private final static Meter meterFetchRequestCalls = new
MetricRegistry().meter("drpc:num-fetchRequest-calls");
+ private final static Meter meterShutdownCalls = new
MetricRegistry().meter("drpc:num-shutdown-calls");
+
+ public DrpcServer() {
+
+ }
+
+ //TODO: to be removed
+ public void setHttpServlet(Servlet httpServlet) {
+ this.httpServlet = httpServlet;
+ }
+
+
+
+ private ThriftServer initHandlerServer(Map conf, final DrpcServer
service) throws Exception {
+ int port = (int) conf.get(Config.DRPC_PORT);
+ if (port > 0) {
+ handlerServer = new ThriftServer(conf, new
DistributedRPC.Processor<DistributedRPC.Iface>(service),
ThriftConnectionType.DRPC);
+ }
+ return handlerServer;
+ }
+
+ private ThriftServer initInvokeServer(Map conf, final DrpcServer
service) throws Exception {
+ invokeServer = new ThriftServer(conf, new
DistributedRPCInvocations.Processor<DistributedRPCInvocations.Iface>(service),
+ ThriftConnectionType.DRPC_INVOCATIONS);
+ return invokeServer;
+ }
+
+ private void initHttp() throws Exception{
+ LOG.info("Starting RPC Http servers...");
+ Integer drpcHttpPort = (Integer) conf.get(Config.DRPC_HTTP_PORT);
+ if (drpcHttpPort != null && drpcHttpPort > 0) {
+ String filterClass = (String)
(conf.get(Config.DRPC_HTTP_FILTER));
+ Map<String, String> filterParams = (Map<String, String>)
(conf.get(Config.DRPC_HTTP_FILTER_PARAMS));
+ FilterConfiguration filterConfiguration = new
FilterConfiguration(filterParams, filterClass);
+ final List<FilterConfiguration> filterConfigurations =
Arrays.asList(filterConfiguration);
+ final Integer httpsPort =
Utils.getInt(conf.get(Config.DRPC_HTTPS_PORT), 0);
+ final String httpsKsPath = (String)
(conf.get(Config.DRPC_HTTPS_KEYSTORE_PATH));
+ final String httpsKsPassword = (String)
(conf.get(Config.DRPC_HTTPS_KEYSTORE_PASSWORD));
+ final String httpsKsType = (String)
(conf.get(Config.DRPC_HTTPS_KEYSTORE_TYPE));
+ final String httpsKeyPassword = (String)
(conf.get(Config.DRPC_HTTPS_KEY_PASSWORD));
+ final String httpsTsPath = (String)
(conf.get(Config.DRPC_HTTPS_TRUSTSTORE_PATH));
+ final String httpsTsPassword = (String)
(conf.get(Config.DRPC_HTTPS_TRUSTSTORE_PASSWORD));
+ final String httpsTsType = (String)
(conf.get(Config.DRPC_HTTPS_TRUSTSTORE_TYPE));
+ final Boolean httpsWantClientAuth = (Boolean)
(conf.get(Config.DRPC_HTTPS_WANT_CLIENT_AUTH));
+ final Boolean httpsNeedClientAuth = (Boolean)
(conf.get(Config.DRPC_HTTPS_NEED_CLIENT_AUTH));
+
+ UIHelpers.stormRunJetty(drpcHttpPort, new IConfigurator() {
+ @Override
+ public void execute(Server s) {
+ UIHelpers.configSsl(s, httpsPort, httpsKsPath,
httpsKsPassword, httpsKsType, httpsKeyPassword, httpsTsPath, httpsTsPassword,
httpsTsType,
+ httpsNeedClientAuth, httpsWantClientAuth);
+ UIHelpers.configFilter(s, httpServlet,
filterConfigurations);
+ }
+ });
+ }
+
+ }
+ private void initThrift() throws Exception {
+
+ handlerServer = initHandlerServer(conf, this);
+ invokeServer = initInvokeServer(conf, this);
+ httpCredsHandler = AuthUtils.GetDrpcHttpCredentialsPlugin(conf);
+ Utils.addShutdownHookWithForceKillIn1Sec(new Runnable() {
+ @Override
+ public void run() {
+ if (handlerServer != null) {
+ handlerServer.stop();
+ } else {
+ invokeServer.stop();
+ }
+ }
+ });
+ LOG.info("Starting Distributed RPC servers...");
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ invokeServer.serve();
+ }
+ }).start();
+
+ //TODO: To be replaced by Common.StartMetricsReporters
+ List<PreparableReporter> reporters =
MetricsUtils.getPreparableReporters(conf);
+ for (PreparableReporter reporter : reporters) {
+ reporter.prepare(new MetricRegistry(), conf);
+ reporter.start();
+ LOG.info("Started statistics report plugin: {}", reporter);
+ }
+ if (handlerServer != null)
+ handlerServer.serve();
+ }
+
+ private void initClearThread() {
+ clearThread = Utils.asyncLoop(new Callable() {
+
+ @Override
+ public Object call() throws Exception {
+ for (Map.Entry<String, InternalRequest> e :
outstandingRequests.entrySet()) {
+ InternalRequest internalRequest = e.getValue();
+ if (Time.deltaSecs(internalRequest.startTimeSecs) >
Utils.getInt(conf.get(Config.DRPC_REQUEST_TIMEOUT_SECS), 0)) {
+ String id = e.getKey();
+ Semaphore sem = internalRequest.sem;
+ if (sem != null) {
+ String func = internalRequest.function;
+
acquireQueue(func).remove(internalRequest.request);
+ LOG.warn("Timeout DRPC request id: {} start at
{}", id, e.getValue());
+ sem.release();
+ }
+ cleanup(id);
+ LOG.info("Clear request " + id);
--- End diff --
This log did not exist in the original code.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
