Changeset 84dfb36 in trunk

Timestamp:

2021-10-26T00:57:23Z (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

2336cae7, 28cc3ca, dd29efc, f02f14a

Parents:

211640a (diff), ad216e0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jean-Paul Calderone <exarkun@…> (2021-10-26 00:57:23)

git-committer:

GitHub <noreply@…> (2021-10-26 00:57:23)

Message:

Merge pull request #1141 from LeastAuthority?/3814.remove-control-port

Remove the "control port" and its associated Tub

Fixes: ticket:3814

Files:

• .gitignore (modified) (1 diff)
• Makefile (modified) (2 diffs)
• misc/checkers/check_memory.py (deleted)
• misc/checkers/check_speed.py (deleted)
• misc/operations_helpers/getmem.py (deleted)
• newsfragments/3814.removed (added)
• src/allmydata/client.py (modified) (6 diffs)
• src/allmydata/control.py (deleted)
• src/allmydata/introducer/server.py (modified) (3 diffs)
• src/allmydata/node.py (modified) (3 diffs)
• src/allmydata/test/no_network.py (modified) (4 diffs)
• src/allmydata/test/test_system.py (modified) (3 diffs)
• src/allmydata/test/web/test_introducer.py (modified) (1 diff)
• tox.ini (modified) (1 diff)

.gitignore ¶

@@ -31 +31 @@
 /src/allmydata/test/plugins/dropin.cache
 /_trial_temp*
-/_test_memory/
 /tmp*
 /*.patch

Makefile ¶

@@ -143 +143 @@
 
 
-# The check-speed and check-grid targets are disabled, since they depend upon
-# the pre-located $(TAHOE) executable that was removed when we switched to
-# tox. They will eventually be resurrected as dedicated tox environments.
-
-# The check-speed target uses a pre-established client node to run a canned
-# set of performance tests against a test network that is also
-# pre-established (probably on a remote machine). Provide it with the path to
-# a local directory where this client node has been created (and populated
-# with the necessary FURLs of the test network). This target will start that
-# client with the current code and then run the tests. Afterwards it will
-# stop the client.
-#
-# The 'sleep 5' is in there to give the new client a chance to connect to its
-# storageservers, since check_speed.py has no good way of doing that itself.
-
-##.PHONY: check-speed
-##check-speed: .built
-##      if [ -z '$(TESTCLIENTDIR)' ]; then exit 1; fi
-##      @echo "stopping any leftover client code"
-##      -$(TAHOE) stop $(TESTCLIENTDIR)
-##      $(TAHOE) start $(TESTCLIENTDIR)
-##      sleep 5
-##      $(TAHOE) @src/allmydata/test/check_speed.py $(TESTCLIENTDIR)
-##      $(TAHOE) stop $(TESTCLIENTDIR)
-
 # The check-grid target also uses a pre-established client node, along with a
 # long-term directory that contains some well-known files. See the docstring
@@ -196 +171 @@
 .PHONY: clean
 clean:
-        rm -rf build _trial_temp _test_memory .built
+        rm -rf build _trial_temp .built
         rm -f `find src *.egg -name '*.so' -or -name '*.pyc'`
         rm -rf support dist
         rm -rf `ls -d *.egg | grep -vEe"setuptools-|setuptools_darcs-|darcsver-"`
         rm -rf *.pyc
-        rm -f bin/tahoe bin/tahoe.pyscript
         rm -f *.pkg
 

src/allmydata/client.py ¶

@@ -41 +41 @@
 from allmydata.immutable.upload import Uploader
 from allmydata.immutable.offloaded import Helper
-from allmydata.control import ControlServer
 from allmydata.introducer.client import IntroducerClient
 from allmydata.util import (
@@ -284 +283 @@
         foolscap_connection_handlers, i2p_provider, tor_provider,
     )
-    control_tub = node.create_control_tub()
 
     introducer_clients = create_introducer_clients(config, main_tub, _introducer_factory)
@@ -295 +293 @@
         config,
         main_tub,
-        control_tub,
         i2p_provider,
         tor_provider,
@@ -632 +629 @@
                                    }
 
-    def __init__(self, config, main_tub, control_tub, i2p_provider, tor_provider, introducer_clients,
+    def __init__(self, config, main_tub, i2p_provider, tor_provider, introducer_clients,
                  storage_farm_broker):
         """
         Use :func:`allmydata.client.create_client` to instantiate one of these.
         """
-        node.Node.__init__(self, config, main_tub, control_tub, i2p_provider, tor_provider)
+        node.Node.__init__(self, config, main_tub, i2p_provider, tor_provider)
 
         self.started_timestamp = time.time()
@@ -649 +646 @@
         self.init_secrets()
         self.init_node_key()
-        self.init_control()
         self._key_generator = KeyGenerator()
         key_gen_furl = config.get_config("client", "key_generator.furl", None)
@@ -986 +982 @@
         return self.history
 
-    def init_control(self):
-        c = ControlServer()
-        c.setServiceParent(self)
-        control_url = self.control_tub.registerReference(c)
-        self.config.write_private_config("control.furl", control_url + "\n")
-
     def init_helper(self):
         self.helper = Helper(self.config.get_config_path("helper"),

src/allmydata/introducer/server.py ¶

@@ -40 +40 @@
 from allmydata.node import create_node_dir
 from allmydata.node import create_connection_handlers
-from allmydata.node import create_control_tub
 from allmydata.node import create_tub_options
 from allmydata.node import create_main_tub
@@ -89 +88 @@
             foolscap_connection_handlers, i2p_provider, tor_provider,
         )
-        control_tub = create_control_tub()
 
         node = _IntroducerNode(
             config,
             main_tub,
-            control_tub,
             i2p_provider,
             tor_provider,
@@ -106 +103 @@
     NODETYPE = "introducer"
 
-    def __init__(self, config, main_tub, control_tub, i2p_provider, tor_provider):
-        node.Node.__init__(self, config, main_tub, control_tub, i2p_provider, tor_provider)
+    def __init__(self, config, main_tub, i2p_provider, tor_provider):
+        node.Node.__init__(self, config, main_tub, i2p_provider, tor_provider)
         self.init_introducer()
         webport = self.get_config("node", "web.port", None)

src/allmydata/node.py ¶

@@ -920 +920 @@
 
 
-def create_control_tub():
-    """
-    Creates a Foolscap Tub for use by the control port. This is a
-    localhost-only ephemeral Tub, with no control over the listening
-    port or location
-    """
-    control_tub = Tub()
-    portnum = iputil.listenOnUnused(control_tub)
-    log.msg("Control Tub location set to 127.0.0.1:%s" % (portnum,))
-    return control_tub
-
-
 class Node(service.MultiService):
     """
@@ -939 +927 @@
     CERTFILE = "node.pem"
 
-    def __init__(self, config, main_tub, control_tub, i2p_provider, tor_provider):
+    def __init__(self, config, main_tub, i2p_provider, tor_provider):
         """
         Initialize the node with the given configuration. Its base directory
@@ -967 +955 @@
         else:
             self.nodeid = self.short_nodeid = None
-
-        self.control_tub = control_tub
-        if self.control_tub is not None:
-            self.control_tub.setServiceParent(self)
 
         self.log("Node constructed. " + __full_version__)

src/allmydata/test/no_network.py ¶

@@ -18 +18 @@
 # This should be useful for tests which want to examine and/or manipulate the
 # uploaded shares, checker/verifier/repairer tests, etc. The clients have no
-# Tubs, so it is not useful for tests that involve a Helper or the
-# control.furl .
+# Tubs, so it is not useful for tests that involve a Helper.
 
 from future.utils import PY2
@@ -252 +251 @@
         config,
         main_tub=None,
-        control_tub=None,
         i2p_provider=None,
         tor_provider=None,
@@ -275 +273 @@
     def init_introducer_client(self):
         pass
-    def create_control_tub(self):
-        pass
     def create_log_tub(self):
         pass
@@ -285 +281 @@
     def stopService(self):
         return service.MultiService.stopService(self)
-    def init_control(self):
-        pass
     def init_helper(self):
         pass

src/allmydata/test/test_system.py ¶

@@ -13 +13 @@
 
 from past.builtins import chr as byteschr, long
-from six import ensure_text, ensure_str
+from six import ensure_text
 
 import os, re, sys, time, json
@@ -781 +781 @@
         d.addCallback(self.log, "did _check_publish_private")
         d.addCallback(self._test_web)
-        d.addCallback(self._test_control)
         d.addCallback(self._test_cli)
         # P now has four top-level children:
@@ -1344 +1343 @@
         self.failUnlessEqual(len(matching), 10)
 
-    def _test_control(self, res):
-        # exercise the remote-control-the-client foolscap interfaces in
-        # allmydata.control (mostly used for performance tests)
-        c0 = self.clients[0]
-        control_furl_file = c0.config.get_private_path("control.furl")
-        control_furl = ensure_str(open(control_furl_file, "r").read().strip())
-        # it doesn't really matter which Tub we use to connect to the client,
-        # so let's just use our IntroducerNode's
-        d = self.introducer.tub.getReference(control_furl)
-        d.addCallback(self._test_control2, control_furl_file)
-        return d
-    def _test_control2(self, rref, filename):
-        d = defer.succeed(None)
-        d.addCallback(lambda res: rref.callRemote("speed_test", 1, 200, False))
-        if sys.platform in ("linux2", "linux3"):
-            d.addCallback(lambda res: rref.callRemote("get_memory_usage"))
-        d.addCallback(lambda res: rref.callRemote("measure_peer_response_time"))
-        return d
-
     def _test_cli(self, res):
         # run various CLI commands (in a thread, since they use blocking

src/allmydata/test/web/test_introducer.py ¶

@@ -212 +212 @@
         main_tub.listenOn(b"tcp:0")
         main_tub.setLocation(b"tcp:127.0.0.1:1")
-        introducer_node = _IntroducerNode(config, main_tub, None, None, None)
+        introducer_node = _IntroducerNode(config, main_tub, None, None)
 
         introducer_service = introducer_node.getServiceNamed("introducer")

tox.ini ¶

@@ -207 +207 @@
          python misc/build_helpers/run-deprecations.py --package allmydata --warnings={env:TAHOE_LAFS_WARNINGS_LOG:_trial_temp/deprecation-warnings.log} trial {env:TAHOE_LAFS_TRIAL_ARGS:--rterrors} {posargs:allmydata}
 
-[testenv:checkmemory]
-commands =
-         rm -rf _test_memory
-         python src/allmydata/test/check_memory.py upload
-         python src/allmydata/test/check_memory.py upload-self
-         python src/allmydata/test/check_memory.py upload-POST
-         python src/allmydata/test/check_memory.py download
-         python src/allmydata/test/check_memory.py download-GET
-         python src/allmydata/test/check_memory.py download-GET-slow
-         python src/allmydata/test/check_memory.py receive
-
 # Use 'tox -e docs' to check formatting and cross-references in docs .rst
 # files. The published docs are built by code run over at readthedocs.org,