From d54c102cee7a61dd3eccd62d60af218aa97a85fc Mon Sep 17 00:00:00 2001

From: Ivan Devat <idevat@redhat.com>

Date: Thu, 9 Jan 2020 15:53:37 +0100

Subject: [PATCH 6/7] squash bz1783106 fix-sinatra-wrapper-performance-issue

create prototype of tornado - thin communication

put socket path to settings

don't mix logs from threads in ruby daemon

run ruby daemon via systemd units

support trailing slash by gui urls e.g. /manage/

decode body from ruby response for log

configure ruby wrapper by socket path

remove env values not used for ruby calls any more

deal with ruby daemon communication issues

fix tests

cleanup ruby server code

deal with errors from ruby daemon in python daemon

remove unused cmdline wrapper

add ruby daemon infrastructure to spec etc.

stop logging to stderr from ruby daemon

fix spec file

* add missing cp for new rubygems

* make sure to start the new ruby daemon on package upgrade

* tests: give the new daemon enough time to start

---

 .gitlab-ci.yml                            |   7 +-

 Makefile                                  |   6 +

 pcs.spec.in                               |  30 ++++-

 pcs/daemon/app/sinatra_ui.py              |   2 +-

 pcs/daemon/env.py                         |  36 ------

 pcs/daemon/ruby_pcsd.py                   | 136 +++++++++++-----------

 pcs/daemon/run.py                         |   8 +-

 pcs/settings_default.py                   |   1 +

 pcs_test/tier0/daemon/app/fixtures_app.py |   3 +-

 pcs_test/tier0/daemon/test_env.py         |  66 +----------

 pcs_test/tier0/daemon/test_ruby_pcsd.py   |  13 +--

 pcsd/Gemfile                              |   1 +

 pcsd/Gemfile.lock                         |   7 ++

 pcsd/Makefile                             |   3 +

 pcsd/bootstrap.rb                         |  20 +++-

 pcsd/cfgsync.rb                           |   6 +-

 pcsd/pcs.rb                               |   9 +-

 pcsd/pcsd-cli.rb                          |   3 +-

 pcsd/pcsd-ruby.service                    |  20 ++++

 pcsd/pcsd.conf                            |   4 +

 pcsd/pcsd.rb                              |  31 ++---

 pcsd/pcsd.service                         |   2 +

 pcsd/pcsd.service-runner                  |  24 ++++

 pcsd/remote.rb                            |   6 +-

 pcsd/rserver.rb                           |  98 ++++++++++++++++

 pcsd/settings.rb                          |   1 +

 pcsd/settings.rb.debian                   |   1 +

 pcsd/sinatra_cmdline_wrapper.rb           |  63 ----------

 28 files changed, 330 insertions(+), 277 deletions(-)

 create mode 100644 pcsd/pcsd-ruby.service

 create mode 100644 pcsd/pcsd.service-runner

 create mode 100644 pcsd/rserver.rb

 delete mode 100644 pcsd/sinatra_cmdline_wrapper.rb

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml

index 23ab56a9..92b32033 100644

--- a/.gitlab-ci.yml

+++ b/.gitlab-ci.yml

@@ -116,8 +116,11 @@ python_smoke_tests:

         procps-ng

         rpms/pcs-ci-*.rpm

       "

-    - /usr/sbin/pcsd & # start pcsd

-    - sleep 10 # wait for pcsd to start up properly

+    - export GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby

+    - /usr/lib/pcsd/pcsd & # start pcsd (ruby - thin)

+    - sleep 10 # wait for pcsd (ruby - thin) to start up properly

+    - /usr/sbin/pcsd & # start pcsd (python - tornado)

+    - sleep 10 # wait for pcsd (python - tornado) to start up properly

     - pcs_test/smoke.sh

   artifacts:

     paths:

diff --git a/Makefile b/Makefile

index f2b0d9b9..b9f64acd 100644

--- a/Makefile

+++ b/Makefile

@@ -267,7 +267,12 @@ ifeq ($(IS_DEBIAN)$(IS_SYSTEMCTL),truefalse)

 else

 	install -d ${DEST_SYSTEMD_SYSTEM}

 	install -m 644 ${SYSTEMD_SERVICE_FILE} ${DEST_SYSTEMD_SYSTEM}/pcsd.service

+	install -m 644 pcsd/pcsd-ruby.service ${DEST_SYSTEMD_SYSTEM}/pcsd-ruby.service

 endif

+	# ${DEST_LIB}/pcsd/pcsd holds the selinux context

+	install -m 755 pcsd/pcsd.service-runner ${DEST_LIB}/pcsd/pcsd

+	rm ${DEST_LIB}/pcsd/pcsd.service-runner

+	

 	install -m 700 -d ${DESTDIR}/var/lib/pcsd

 	install -m 644 -D pcsd/pcsd.logrotate ${DESTDIR}/etc/logrotate.d/pcsd

 	install -m644 -D pcsd/pcsd.8 ${DEST_MAN}/pcsd.8

@@ -293,6 +298,7 @@ ifeq ($(IS_DEBIAN)$(IS_SYSTEMCTL),truefalse)

 	rm -f ${DEST_INIT}/pcsd

 else

 	rm -f ${DEST_SYSTEMD_SYSTEM}/pcsd.service

+	rm -f ${DEST_SYSTEMD_SYSTEM}/pcsd-ruby.service

 	rm -f ${DEST_SYSTEMD_SYSTEM}/pcs_snmp_agent.service

 endif

 	rm -f ${DESTDIR}/etc/pam.d/pcsd

diff --git a/pcs.spec.in b/pcs.spec.in

index 5195dc51..32fbf614 100644

--- a/pcs.spec.in

+++ b/pcs.spec.in

@@ -28,7 +28,9 @@ Summary: Pacemaker Configuration System

 %global pyagentx_version   0.4.pcs.2

 %global tornado_version    6.0.3

 %global version_rubygem_backports  3.11.4

+%global version_rubygem_daemons  1.3.1

 %global version_rubygem_ethon  0.11.0

+%global version_rubygem_eventmachine  1.2.7

 %global version_rubygem_ffi  1.9.25

 %global version_rubygem_json  2.1.0

 %global version_rubygem_mustermann  1.0.3

@@ -37,6 +39,7 @@ Summary: Pacemaker Configuration System

 %global version_rubygem_rack_protection  2.0.4

 %global version_rubygem_rack_test  1.0.0

 %global version_rubygem_sinatra  2.0.4

+%global version_rubygem_thin  1.7.2

 %global version_rubygem_tilt  2.0.9

 # We do not use _libdir macro because upstream is not prepared for it.

@@ -83,6 +86,9 @@ Source89: https://rubygems.org/downloads/rack-protection-%{version_rubygem_rack_

 Source90: https://rubygems.org/downloads/rack-test-%{version_rubygem_rack_test}.gem

 Source91: https://rubygems.org/downloads/sinatra-%{version_rubygem_sinatra}.gem

 Source92: https://rubygems.org/downloads/tilt-%{version_rubygem_tilt}.gem

+Source93: https://rubygems.org/downloads/eventmachine-%{version_rubygem_eventmachine}.gem

+Source94: https://rubygems.org/downloads/daemons-%{version_rubygem_daemons}.gem

+Source95: https://rubygems.org/downloads/thin-%{version_rubygem_thin}.gem

 Source100: https://github.com/idevat/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz

 Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_commit}.tar.xz

@@ -164,7 +170,9 @@ Recommends: overpass-fonts

 Provides: bundled(tornado) = %{tornado_version}

 Provides: bundled(backports) = %{version_rubygem_backports}

+Provides: bundled(daemons) = %{version_rubygem_daemons}

 Provides: bundled(ethon) = %{version_rubygem_ethon}

+Provides: bundled(eventmachine) = %{version_rubygem_eventmachine}

 Provides: bundled(ffi) = %{version_rubygem_ffi}

 Provides: bundled(json) = %{version_rubygem_json}

 Provides: bundled(mustermann) = %{version_rubygem_mustermann}

@@ -173,6 +181,7 @@ Provides: bundled(rack) = %{version_rubygem_rack}

 Provides: bundled(rack) = %{version_rubygem_rack_protection}

 Provides: bundled(rack) = %{version_rubygem_rack_test}

 Provides: bundled(sinatra) = %{version_rubygem_sinatra}

+Provides: bundled(thin) = %{version_rubygem_thin}

 Provides: bundled(tilt) = %{version_rubygem_tilt}

 %description

@@ -228,6 +237,9 @@ cp -f %SOURCE89 pcsd/vendor/cache

 cp -f %SOURCE90 pcsd/vendor/cache

 cp -f %SOURCE91 pcsd/vendor/cache

 cp -f %SOURCE92 pcsd/vendor/cache

+cp -f %SOURCE93 pcsd/vendor/cache

+cp -f %SOURCE94 pcsd/vendor/cache

+cp -f %SOURCE95 pcsd/vendor/cache

 # 3) dir for python bundles

@@ -262,15 +274,18 @@ gem install \

   --force --verbose -l --no-user-install %{gem_install_params} \

   -i %{rubygem_bundle_dir} \

   %{rubygem_cache_dir}/backports-%{version_rubygem_backports}.gem \

+  %{rubygem_cache_dir}/daemons-%{version_rubygem_daemons}.gem \

   %{rubygem_cache_dir}/ethon-%{version_rubygem_ethon}.gem \

+  %{rubygem_cache_dir}/eventmachine-%{version_rubygem_eventmachine}.gem \

   %{rubygem_cache_dir}/ffi-%{version_rubygem_ffi}.gem \

   %{rubygem_cache_dir}/json-%{version_rubygem_json}.gem \

   %{rubygem_cache_dir}/mustermann-%{version_rubygem_mustermann}.gem \

   %{rubygem_cache_dir}/open4-%{version_rubygem_open4}.gem \

-  %{rubygem_cache_dir}/rack-%{version_rubygem_rack}.gem \

   %{rubygem_cache_dir}/rack-protection-%{version_rubygem_rack_protection}.gem \

   %{rubygem_cache_dir}/rack-test-%{version_rubygem_rack_test}.gem \

+  %{rubygem_cache_dir}/rack-%{version_rubygem_rack}.gem \

   %{rubygem_cache_dir}/sinatra-%{version_rubygem_sinatra}.gem \

+  %{rubygem_cache_dir}/thin-%{version_rubygem_thin}.gem \

   %{rubygem_cache_dir}/tilt-%{version_rubygem_tilt}.gem \

   -- '--with-ldflags=-Wl,-z,relro -Wl,-z,ibt -Wl,-z,now -Wl,--gc-sections' \

      '--with-cflags=-O2 -ffunction-sections'

@@ -324,20 +339,31 @@ rm -r -v ${pcsd_dir}/test

 # remove javascript testing files

 rm -r -v ${pcsd_dir}/public/js/dev

+%posttrans

+# Make sure the new version of the daemon is runnning.

+# Also, make sure to start pcsd-ruby if it hasn't been started or even

+# installed before. This is done by restarting pcsd.service.

+%{_bindir}/systemctl daemon-reload

+%{_bindir}/systemctl try-restart pcsd.service

+

+

 %post

 %systemd_post pcsd.service

+%systemd_post pcsd-ruby.service

 %post -n %{pcs_snmp_pkg_name}

 %systemd_post pcs_snmp_agent.service

 %preun

 %systemd_preun pcsd.service

+%systemd_preun pcsd-ruby.service

 %preun -n %{pcs_snmp_pkg_name}

 %systemd_preun pcs_snmp_agent.service

 %postun

 %systemd_postun_with_restart pcsd.service

+%systemd_postun_with_restart pcsd-ruby.service

 %postun -n %{pcs_snmp_pkg_name}

 %systemd_postun_with_restart pcs_snmp_agent.service

@@ -357,6 +383,7 @@ rm -r -v ${pcsd_dir}/public/js/dev

 %{pcs_libdir}/pcsd/.bundle/config

 %{pcs_libdir}/pcs/bundled/packages/tornado*

 %{_unitdir}/pcsd.service

+%{_unitdir}/pcsd-ruby.service

 %{_datadir}/bash-completion/completions/pcs

 %{_sharedstatedir}/pcsd

 %{_sysconfdir}/pam.d/pcsd

@@ -374,6 +401,7 @@ rm -r -v ${pcsd_dir}/public/js/dev

 %{_mandir}/man8/pcsd.*

 %exclude %{pcs_libdir}/pcsd/*.debian

 %exclude %{pcs_libdir}/pcsd/pcsd.service

+%exclude %{pcs_libdir}/pcsd/pcsd-ruby.service

 %exclude %{pcs_libdir}/pcsd/pcsd.conf

 %exclude %{pcs_libdir}/pcsd/pcsd.8

 %exclude %{pcs_libdir}/pcsd/public/js/dev/*

diff --git a/pcs/daemon/app/sinatra_ui.py b/pcs/daemon/app/sinatra_ui.py

index 1348134d..5315a48f 100644

--- a/pcs/daemon/app/sinatra_ui.py

+++ b/pcs/daemon/app/sinatra_ui.py

@@ -153,7 +153,7 @@ def get_routes(

         # The protection by session was moved from ruby code to python code

         # (tornado).

         (

-            r"/($|manage$|permissions$|managec/.+/main)",

+            r"/($|manage/?$|permissions/?$|managec/.+/main)",

             SinatraGuiProtected,

             {**sessions, **ruby_wrapper}

         ),

diff --git a/pcs/daemon/env.py b/pcs/daemon/env.py

index 54a9819f..26cdcf9b 100644

--- a/pcs/daemon/env.py

+++ b/pcs/daemon/env.py

@@ -15,7 +15,6 @@ from pcs.lib.validate import is_port_number

 # Relative location instead of system location is used for development purposes.

 PCSD_LOCAL_DIR = realpath(dirname(abspath(__file__)) + "/../../pcsd")

-PCSD_CMDLINE_ENTRY_RB_SCRIPT = "sinatra_cmdline_wrapper.rb"

 PCSD_STATIC_FILES_DIR_NAME = "public"

 PCSD_PORT = "PCSD_PORT"

@@ -26,12 +25,8 @@ NOTIFY_SOCKET = "NOTIFY_SOCKET"

 PCSD_DEBUG = "PCSD_DEBUG"

 PCSD_DISABLE_GUI = "PCSD_DISABLE_GUI"

 PCSD_SESSION_LIFETIME = "PCSD_SESSION_LIFETIME"

-GEM_HOME = "GEM_HOME"

 PCSD_DEV = "PCSD_DEV"

-PCSD_CMDLINE_ENTRY = "PCSD_CMDLINE_ENTRY"

 PCSD_STATIC_FILES_DIR = "PCSD_STATIC_FILES_DIR"

-HTTPS_PROXY = "HTTPS_PROXY"

-NO_PROXY = "NO_PROXY"

 Env = namedtuple("Env", [

     PCSD_PORT,

@@ -42,11 +37,7 @@ Env = namedtuple("Env", [

     PCSD_DEBUG,

     PCSD_DISABLE_GUI,

     PCSD_SESSION_LIFETIME,

-    GEM_HOME,

-    PCSD_CMDLINE_ENTRY,

     PCSD_STATIC_FILES_DIR,

-    HTTPS_PROXY,

-    NO_PROXY,

     PCSD_DEV,

     "has_errors",

 ])

@@ -62,11 +53,7 @@ def prepare_env(environ, logger=None):

         loader.pcsd_debug(),

         loader.pcsd_disable_gui(),

         loader.session_lifetime(),

-        loader.gem_home(),

-        loader.pcsd_cmdline_entry(),

         loader.pcsd_static_files_dir(),

-        loader.https_proxy(),

-        loader.no_proxy(),

         loader.pcsd_dev(),

         loader.has_errors(),

     )

@@ -173,20 +160,6 @@ class EnvLoader:

     def pcsd_debug(self):

         return self.__has_true_in_environ(PCSD_DEBUG)

-    def gem_home(self):

-        if settings.pcsd_gem_path is None:

-            return None

-        return self.__in_pcsd_path(

-            settings.pcsd_gem_path,

-            "Ruby gem location"

-        )

-

-    def pcsd_cmdline_entry(self):

-        return self.__in_pcsd_path(

-            PCSD_CMDLINE_ENTRY_RB_SCRIPT,

-            "Ruby handlers entrypoint"

-        )

-

     def pcsd_static_files_dir(self):

         return self.__in_pcsd_path(

             PCSD_STATIC_FILES_DIR_NAME,

@@ -194,15 +167,6 @@ class EnvLoader:

             existence_required=not self.pcsd_disable_gui()

         )

-    def https_proxy(self):

-        for key in ["https_proxy", HTTPS_PROXY, "all_proxy", "ALL_PROXY"]:

-            if key in self.environ:

-                return self.environ[key]

-        return None

-

-    def no_proxy(self):

-        return self.environ.get("no_proxy", self.environ.get(NO_PROXY, None))

-

     @lru_cache()

     def pcsd_dev(self):

         return self.__has_true_in_environ(PCSD_DEV)

diff --git a/pcs/daemon/ruby_pcsd.py b/pcs/daemon/ruby_pcsd.py

index 5bdaffeb..e612f8da 100644

--- a/pcs/daemon/ruby_pcsd.py

+++ b/pcs/daemon/ruby_pcsd.py

@@ -1,14 +1,16 @@

 import json

 import logging

-import os.path

-from base64 import b64decode

+from base64 import b64decode, b64encode, binascii

 from collections import namedtuple

 from time import time as now

-from tornado.gen import multi, convert_yielded

+import pycurl

+from tornado.gen import convert_yielded

 from tornado.web import HTTPError

 from tornado.httputil import split_host_and_port, HTTPServerRequest

-from tornado.process import Subprocess

+from tornado.httpclient import AsyncHTTPClient

+from tornado.curl_httpclient import CurlError

+

 from pcs.daemon import log

@@ -33,7 +35,7 @@ class SinatraResult(namedtuple("SinatraResult", "headers, status, body")):

         return cls(

             response["headers"],

             response["status"],

-            b64decode(response["body"])

+            response["body"]

         )

 def log_group_id_generator():

@@ -58,24 +60,12 @@ def process_response_logs(rb_log_list):

             group_id=group_id

         )

-def log_communication(request_json, stdout, stderr):

-    log.pcsd.debug("Request for ruby pcsd wrapper: '%s'", request_json)

-    log.pcsd.debug("Response stdout from ruby pcsd wrapper: '%s'", stdout)

-    log.pcsd.debug("Response stderr from ruby pcsd wrapper: '%s'", stderr)

-

 class Wrapper:

-    # pylint: disable=too-many-instance-attributes

-    def __init__(

-        self, pcsd_cmdline_entry, gem_home=None, debug=False,

-        ruby_executable="ruby", https_proxy=None, no_proxy=None

-    ):

-        self.__gem_home = gem_home

-        self.__pcsd_cmdline_entry = pcsd_cmdline_entry

-        self.__pcsd_dir = os.path.dirname(pcsd_cmdline_entry)

-        self.__ruby_executable = ruby_executable

+    def __init__(self, pcsd_ruby_socket, debug=False):

         self.__debug = debug

-        self.__https_proxy = https_proxy

-        self.__no_proxy = no_proxy

+        AsyncHTTPClient.configure('tornado.curl_httpclient.CurlAsyncHTTPClient')

+        self.__client = AsyncHTTPClient()

+        self.__pcsd_ruby_socket = pcsd_ruby_socket

     @staticmethod

     def get_sinatra_request(request: HTTPServerRequest):

@@ -102,55 +92,76 @@ class Wrapper:

             "rack.input": request.body.decode("utf8"),

         }}

+    def prepare_curl_callback(self, curl):

+        curl.setopt(pycurl.UNIX_SOCKET_PATH, self.__pcsd_ruby_socket)

+        curl.setopt(pycurl.TIMEOUT, 70)

+

     async def send_to_ruby(self, request_json):

-        env = {

-            "PCSD_DEBUG": "true" if self.__debug else "false"

-        }

-        if self.__gem_home is not None:

-            env["GEM_HOME"] = self.__gem_home

-

-        if self.__no_proxy is not None:

-            env["NO_PROXY"] = self.__no_proxy

-        if self.__https_proxy is not None:

-            env["HTTPS_PROXY"] = self.__https_proxy

-

-        pcsd_ruby = Subprocess(

-            [

-                self.__ruby_executable, "-I",

-                self.__pcsd_dir,

-                self.__pcsd_cmdline_entry

-            ],

-            stdin=Subprocess.STREAM,

-            stdout=Subprocess.STREAM,

-            stderr=Subprocess.STREAM,

-            env=env

-        )

-        await pcsd_ruby.stdin.write(str.encode(request_json))

-        pcsd_ruby.stdin.close()

-        return await multi([

-            pcsd_ruby.stdout.read_until_close(),

-            pcsd_ruby.stderr.read_until_close(),

-            pcsd_ruby.wait_for_exit(raise_error=False),

-        ])

+        # We do not need location for communication with ruby itself since we

+        # communicate via unix socket. But it is required by AsyncHTTPClient so

+        # "localhost" is used.

+        tornado_request = b64encode(request_json.encode()).decode()

+        return (await self.__client.fetch(

+            "localhost",

+            method="POST",

+            body=f"TORNADO_REQUEST={tornado_request}",

+            prepare_curl_callback=self.prepare_curl_callback,

+        )).body

     async def run_ruby(self, request_type, request=None):

+        """

+        request_type: SINATRA_GUI|SINATRA_REMOTE|SYNC_CONFIGS

+        request: result of get_sinatra_request|None

+            i.e. it has structure returned by get_sinatra_request if the request

+            is not None - so we can get SERVER_NAME and  SERVER_PORT

+        """

         request = request or {}

         request.update({"type": request_type})

         request_json = json.dumps(request)

-        stdout, stderr, dummy_status = await self.send_to_ruby(request_json)

+

+        if self.__debug:

+            log.pcsd.debug("Ruby daemon request: '%s'", request_json)

         try:

-            response = json.loads(stdout)

-        except json.JSONDecodeError as e:

-            self.__log_bad_response(

-                f"Cannot decode json from ruby pcsd wrapper: '{e}'",

-                request_json, stdout, stderr

+            ruby_response = await self.send_to_ruby(request_json)

+        except CurlError as e:

+            log.pcsd.error(

+                "Cannot connect to ruby daemon (message: '%s'). Is it running?",

+                e

             )

             raise HTTPError(500)

-        else:

-            if self.__debug:

-                log_communication(request_json, stdout, stderr)

-            process_response_logs(response["logs"])

+

+        try:

+            response = json.loads(ruby_response)

+            if "error" in response:

+                log.pcsd.error(

+                    "Ruby daemon response contains an error: '%s'",

+                    json.dumps(response)

+                )

+                raise HTTPError(500)

+

+            logs = response.pop("logs", [])

+            if "body" in response:

+                body = b64decode(response.pop("body"))

+                if self.__debug:

+                    log.pcsd.debug(

+                        "Ruby daemon response (without logs and body): '%s'",

+                        json.dumps(response)

+                    )

+                    log.pcsd.debug("Ruby daemon response body: '%s'", body)

+                response["body"] = body

+

+            elif self.__debug:

+                log.pcsd.debug(

+                    "Ruby daemon response (without logs): '%s'",

+                    json.dumps(response)

+                )

+            process_response_logs(logs)

             return response

+        except (json.JSONDecodeError, binascii.Error) as e:

+            if self.__debug:

+                log.pcsd.debug("Ruby daemon response: '%s'", ruby_response)

+            log.pcsd.error("Cannot decode json from ruby pcsd wrapper: '%s'", e)

+            raise HTTPError(500)

     async def request_gui(

         self, request: HTTPServerRequest, user, groups, is_authenticated

@@ -186,8 +197,3 @@ class Wrapper:

         except HTTPError:

             log.pcsd.error("Config synchronization failed")

             return int(now()) + DEFAULT_SYNC_CONFIG_DELAY

-

-    def __log_bad_response(self, error_message, request_json, stdout, stderr):

-        log.pcsd.error(error_message)

-        if self.__debug:

-            log_communication(request_json, stdout, stderr)

diff --git a/pcs/daemon/run.py b/pcs/daemon/run.py

index bafd9f3c..874ee2f1 100644

--- a/pcs/daemon/run.py

+++ b/pcs/daemon/run.py

@@ -65,6 +65,8 @@ def configure_app(

                 # old web ui by default

                 [(r"/", RedirectHandler, dict(url="/manage"))]

                 +

+                [(r"/ui", RedirectHandler, dict(url="/ui/"))]

+                +

                 ui.get_routes(

                     url_prefix="/ui/",

                     app_dir=os.path.join(public_dir, "ui"),

@@ -101,12 +103,8 @@ def main():

     sync_config_lock = Lock()

     ruby_pcsd_wrapper = ruby_pcsd.Wrapper(

-        pcsd_cmdline_entry=env.PCSD_CMDLINE_ENTRY,

-        gem_home=env.GEM_HOME,

+        settings.pcsd_ruby_socket,

         debug=env.PCSD_DEBUG,

-        ruby_executable=settings.ruby_executable,

-        https_proxy=env.HTTPS_PROXY,

-        no_proxy=env.NO_PROXY,

     )

     make_app = configure_app(

         session.Storage(env.PCSD_SESSION_LIFETIME),

diff --git a/pcs/settings_default.py b/pcs/settings_default.py

index 6d8f33ac..f761ce43 100644

--- a/pcs/settings_default.py

+++ b/pcs/settings_default.py

@@ -43,6 +43,7 @@ cibadmin = os.path.join(pacemaker_binaries, "cibadmin")

 crm_mon_schema = '/usr/share/pacemaker/crm_mon.rng'

 agent_metadata_schema = "/usr/share/resource-agents/ra-api-1.dtd"

 pcsd_var_location = "/var/lib/pcsd/"

+pcsd_ruby_socket = "/run/pcsd-ruby.socket"

 pcsd_cert_location = os.path.join(pcsd_var_location, "pcsd.crt")

 pcsd_key_location = os.path.join(pcsd_var_location, "pcsd.key")

 pcsd_known_hosts_location = os.path.join(pcsd_var_location, "known-hosts")

diff --git a/pcs_test/tier0/daemon/app/fixtures_app.py b/pcs_test/tier0/daemon/app/fixtures_app.py

index 2e4feba4..8d5b8f4c 100644

--- a/pcs_test/tier0/daemon/app/fixtures_app.py

+++ b/pcs_test/tier0/daemon/app/fixtures_app.py

@@ -1,4 +1,3 @@

-from base64 import b64encode

 from pprint import pformat

 from urllib.parse import urlencode

@@ -30,7 +29,7 @@ class RubyPcsdWrapper(ruby_pcsd.Wrapper):

         return {

             "headers": self.headers,

             "status": self.status_code,

-            "body": b64encode(self.body),

+            "body": self.body,

         }

 class AppTest(AsyncHTTPTestCase):

diff --git a/pcs_test/tier0/daemon/test_env.py b/pcs_test/tier0/daemon/test_env.py

index 9e78eafd..e2f7f5b1 100644

--- a/pcs_test/tier0/daemon/test_env.py

+++ b/pcs_test/tier0/daemon/test_env.py

@@ -41,11 +41,7 @@ class Prepare(TestCase, create_setup_patch_mixin(env)):

             env.PCSD_DEBUG: False,

             env.PCSD_DISABLE_GUI: False,

             env.PCSD_SESSION_LIFETIME: settings.gui_session_lifetime_seconds,

-            env.GEM_HOME: pcsd_dir(settings.pcsd_gem_path),

-            env.PCSD_CMDLINE_ENTRY: pcsd_dir(env.PCSD_CMDLINE_ENTRY_RB_SCRIPT),

             env.PCSD_STATIC_FILES_DIR: pcsd_dir(env.PCSD_STATIC_FILES_DIR_NAME),

-            env.HTTPS_PROXY: None,

-            env.NO_PROXY: None,

             env.PCSD_DEV: False,

             "has_errors": False,

         }

@@ -77,8 +73,6 @@ class Prepare(TestCase, create_setup_patch_mixin(env)):

             env.PCSD_DISABLE_GUI: "true",

             env.PCSD_SESSION_LIFETIME: str(session_lifetime),

             env.PCSD_DEV: "true",

-            env.HTTPS_PROXY: "proxy1",

-            env.NO_PROXY: "host",

             env.PCSD_DEV: "true",

         }

         self.assert_environ_produces_modified_pcsd_env(

@@ -92,15 +86,9 @@ class Prepare(TestCase, create_setup_patch_mixin(env)):

                 env.PCSD_DEBUG: True,

                 env.PCSD_DISABLE_GUI: True,

                 env.PCSD_SESSION_LIFETIME: session_lifetime,

-                env.GEM_HOME: pcsd_dir(settings.pcsd_gem_path),

-                env.PCSD_CMDLINE_ENTRY: pcsd_dir(

-                    env.PCSD_CMDLINE_ENTRY_RB_SCRIPT

-                ),

                 env.PCSD_STATIC_FILES_DIR: pcsd_dir(

                     env.PCSD_STATIC_FILES_DIR_NAME

                 ),

-                env.HTTPS_PROXY: environ[env.HTTPS_PROXY],

-                env.NO_PROXY: environ[env.NO_PROXY],

                 env.PCSD_DEV: True,

             },

         )

@@ -167,13 +155,6 @@ class Prepare(TestCase, create_setup_patch_mixin(env)):

         self.assert_environ_produces_modified_pcsd_env(

             specific_env_values={"has_errors": True},

             errors=[

-                f"Ruby gem location '{pcsd_dir(settings.pcsd_gem_path)}'"

-                    " does not exist"

-                ,

-                "Ruby handlers entrypoint"

-                    f" '{pcsd_dir(env.PCSD_CMDLINE_ENTRY_RB_SCRIPT)}'"

-                    " does not exist"

-                ,

                 "Directory with web UI assets"

                     f" '{pcsd_dir(env.PCSD_STATIC_FILES_DIR_NAME)}'"

                     " does not exist"

@@ -181,54 +162,13 @@ class Prepare(TestCase, create_setup_patch_mixin(env)):

             ]

         )

-    def test_errors_on_missing_paths_disabled_gui(self):

+    def test_no_errors_on_missing_paths_disabled_gui(self):

         self.path_exists.return_value = False

-        pcsd_dir = partial(join_path, settings.pcsd_exec_location)

         self.assert_environ_produces_modified_pcsd_env(

             environ={env.PCSD_DISABLE_GUI: "true"},

             specific_env_values={

                 env.PCSD_DISABLE_GUI: True,

-                "has_errors": True,

+                "has_errors": False,

             },

-            errors=[

-                f"Ruby gem location '{pcsd_dir(settings.pcsd_gem_path)}'"

-                    " does not exist"

-                ,

-                "Ruby handlers entrypoint"

-                    f" '{pcsd_dir(env.PCSD_CMDLINE_ENTRY_RB_SCRIPT)}'"

-                    " does not exist"

-                ,

-            ]

+            errors=[]

         )

-

-    def test_lower_case_no_proxy_has_precedence(self):

-        def it_selects(proxy_value):

-            self.assert_environ_produces_modified_pcsd_env(

-                environ=environ,

-                specific_env_values={env.NO_PROXY: proxy_value}

-            )

-

-        environ = {"NO_PROXY": "no_proxy_1"}

-        it_selects("no_proxy_1")

-

-        environ["no_proxy"] = "no_proxy_2"

-        it_selects("no_proxy_2")

-

-    def test_http_proxy_is_setup_by_precedence(self):

-        def it_selects(proxy_value):

-            self.assert_environ_produces_modified_pcsd_env(

-                environ=environ,

-                specific_env_values={env.HTTPS_PROXY: proxy_value}

-            )

-

-        environ = {"ALL_PROXY": "all_proxy_1"}

-        it_selects("all_proxy_1")

-

-        environ["all_proxy"] = "all_proxy_2"

-        it_selects("all_proxy_2")

-

-        environ["HTTPS_PROXY"] = "https_proxy_1"

-        it_selects("https_proxy_1")

-

-        environ["https_proxy"] = "https_proxy_2"

-        it_selects("https_proxy_2")

diff --git a/pcs_test/tier0/daemon/test_ruby_pcsd.py b/pcs_test/tier0/daemon/test_ruby_pcsd.py

index d7fd71a0..28f14c87 100644

--- a/pcs_test/tier0/daemon/test_ruby_pcsd.py

+++ b/pcs_test/tier0/daemon/test_ruby_pcsd.py

@@ -16,10 +16,7 @@ from pcs.daemon import ruby_pcsd

 logging.getLogger("pcs.daemon").setLevel(logging.CRITICAL)

 def create_wrapper():

-    return ruby_pcsd.Wrapper(

-        rc("/path/to/gem_home"),

-        rc("/path/to/pcsd/cmdline/entry"),

-    )

+    return ruby_pcsd.Wrapper(rc("/path/to/ruby_socket"))

 def create_http_request():

     return HTTPServerRequest(