Github user revans2 commented on a diff in the pull request:
https://github.com/apache/storm/pull/1156#discussion_r54299761
--- Diff: storm-core/src/clj/org/apache/storm/daemon/drpc.clj ---
@@ -210,67 +63,19 @@
(wrap-reload '[org.apache.storm.daemon.drpc])
handle-request))
+
(defn launch-server!
([]
- (log-message "Starting drpc server for storm version '" STORM-VERSION
"'")
(let [conf (clojurify-structure (ConfigUtils/readStormConfig))
- worker-threads (int (conf DRPC-WORKER-THREADS))
- queue-size (int (conf DRPC-QUEUE-SIZE))
drpc-http-port (int (conf DRPC-HTTP-PORT))
- drpc-port (int (conf DRPC-PORT))
- drpc-service-handler (service-handler conf)
- ;; requests and returns need to be on separate thread pools,
since calls to
- ;; "execute" don't unblock until other thrift methods are
called. So if
- ;; 64 threads are calling execute, the server won't accept the
result
- ;; invocations that will unblock those threads
- handler-server (when (> drpc-port 0)
- (ThriftServer. conf
- (DistributedRPC$Processor.
drpc-service-handler)
- ThriftConnectionType/DRPC))
- invoke-server (ThriftServer. conf
- (DistributedRPCInvocations$Processor.
drpc-service-handler)
- ThriftConnectionType/DRPC_INVOCATIONS)
+ drpc-server (DrpcServer.)
http-creds-handler (AuthUtils/GetDrpcHttpCredentialsPlugin conf)]
- (Utils/addShutdownHookWithForceKillIn1Sec (fn []
- (if handler-server (.stop
handler-server))
- (.stop invoke-server)))
- (log-message "Starting Distributed RPC servers...")
- (future (.serve invoke-server))
(when (> drpc-http-port 0)
- (let [app (-> (webapp drpc-service-handler http-creds-handler)
- requests-middleware)
- filter-class (conf DRPC-HTTP-FILTER)
- filter-params (conf DRPC-HTTP-FILTER-PARAMS)
- filters-confs [(FilterConfiguration. filter-class
filter-params)]
- https-port (int (or (conf DRPC-HTTPS-PORT) 0))
- https-ks-path (conf DRPC-HTTPS-KEYSTORE-PATH)
- https-ks-password (conf DRPC-HTTPS-KEYSTORE-PASSWORD)
- https-ks-type (conf DRPC-HTTPS-KEYSTORE-TYPE)
- https-key-password (conf DRPC-HTTPS-KEY-PASSWORD)
- https-ts-path (conf DRPC-HTTPS-TRUSTSTORE-PATH)
- https-ts-password (conf DRPC-HTTPS-TRUSTSTORE-PASSWORD)
- https-ts-type (conf DRPC-HTTPS-TRUSTSTORE-TYPE)
- https-want-client-auth (conf DRPC-HTTPS-WANT-CLIENT-AUTH)
- https-need-client-auth (conf DRPC-HTTPS-NEED-CLIENT-AUTH)]
-
- (UIHelpers/stormRunJetty
- (int drpc-http-port)
- (reify IConfigurator (execute [this server]
- (UIHelpers/configSsl server
- https-port
- https-ks-path
- https-ks-password
- https-ks-type
- https-key-password
- https-ts-path
- https-ts-password
- https-ts-type
- https-need-client-auth
- https-want-client-auth)
- (UIHelpers/configFilter server
(ring.util.servlet/servlet app) filters-confs))))))
- (start-metrics-reporters conf)
- (when handler-server
- (.serve handler-server)))))
+ (let [app (-> (webapp drpc-server http-creds-handler)
--- End diff --
Can we please have a follow on JIRA to port the webapp portion over to java
too? Until it is done I don't consider DRPC moved to java.
---
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.
---
