hgitaly 18.5.2__tar.gz → 18.5.4__tar.gz

{hgitaly-18.5.2/hgitaly.egg-info → hgitaly-18.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.5.2
+Version: 18.5.4
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -10,10 +10,10 @@ Keywords: hg mercurial heptapod gitlab
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: heptapod>=5.4.0
+Requires-Dist: heptapod~=5.4.0
 Requires-Dist: protobuf~=6.31.1
-Requires-Dist: grpcio~=1.75.0
-Requires-Dist: grpcio-status~=1.75.0
+Requires-Dist: grpcio~=1.76.0
+Requires-Dist: grpcio-status~=1.76.0
 Requires-Dist: grpc-interceptor
 Requires-Dist: grpcio-health-checking
 Requires-Dist: hg-loggingmod>=0.4.1

{hgitaly-18.5.2 → hgitaly-18.5.4}/hgext3rd/hgitaly/__init__.py

@@ -7,6 +7,7 @@
 
 # flake8: noqa E402
 import os
+from pathlib import Path
 import time
 from mercurial.i18n import _
 from mercurial import (
@@ -28,6 +29,9 @@ from hgitaly.server import (
 )
 from . import revset
 
+DEFAULT_CLIENT_ID_SLUG = b'self-client.uuid'
+
+
 if util.safehasattr(registrar, 'configitem'):
 
     configtable = {}
@@ -74,6 +78,13 @@ def reraise_abort(msg, exc):
              b'No forking occurs, the main process is the single worker. '
              b'In particular the hgitaly.workers configuration item is '
              b'ignored.')),
+          (b'', b'client-id-file-name',
+           DEFAULT_CLIENT_ID_SLUG,
+           _(b'Specify the Client ID file name. This is useful for mono workers '
+             b'in externally managed pools (RHGitaly managed sidecar), hence '
+             b'having distinct Incarnation IDs, so that they do not steal each other '
+             b'working directories.',
+             )),
           ],
          _(b'[OPTIONS]...'),
          norepo=True
@@ -111,7 +122,9 @@ def serve(ui, **opts):
                 ))
     config_root = os.fsdecode(ui.config(b'hgitaly', b'configuration-root',
                                         default=repos_root))
-    ensure_client_id(config_root)
+    client_id_slug = opts.get('client_id_file_name', DEFAULT_CLIENT_ID_SLUG)
+    client_id_path = Path(config_root) / '+hgitaly' / os.fsdecode(client_id_slug)
+    ensure_client_id(client_id_path)
     nb_workers = ui.configint(b'hgitaly', b'workers')
     run_opts = dict(nb_workers=nb_workers,
                     restart_done_workers=True,

hgitaly-18.5.4/hgitaly/VERSION

@@ -0,0 +1 @@
+18.5.4

{hgitaly-18.5.2 → hgitaly-18.5.4}/hgitaly/identification.py

@@ -20,9 +20,8 @@ restarted since the recording, and thus that the operation is obsolete
 killed).
 
 An HGitaly server is always consider to be its own client, even if it accesses
-the resources flagged with these IDs in-process rathere than through gRPC.
+the resources flagged with these IDs in-process rather than through gRPC.
 """
-from pathlib import Path
 import time
 import uuid
 
@@ -31,13 +30,14 @@ CLIENT_ID_SLUG = '+hgitaly/self-client.uuid'
 CLIENT_ID = None  # initialized at startup
 
 
-def ensure_client_id(config_root):
+def ensure_client_id(path):
     """To be used in startup sequence, before any concurrency is possible."""
     global CLIENT_ID
 
-    path = Path(config_root) / CLIENT_ID_SLUG
     if path.exists():
-        CLIENT_ID = path.read_text().strip()
+        # chances that anything or anyone creates a non-utf8 Client ID are very
+        # slim (and it would be immediately noticed)
+        CLIENT_ID = path.read_text(encoding='utf-8').strip()
         return
 
     client_id = str(uuid.uuid4())

{hgitaly-18.5.2 → hgitaly-18.5.4}/hgitaly/message.py

@@ -248,8 +248,9 @@ def tag(name, target, tagging=None, signature_type=None):
         signature_type = SignatureType.NONE
 
     if tagging is None:
-        tag_id = message = tag_author = None
+        message = tag_author = None
         message_size = 0
+        tag_id = pycompat.sysstr(target.hex())
     else:
         # TODO SPEC comment in `shared.proto` says the message will be
         # nullified if above a certain size and the size will be carried over,

{hgitaly-18.5.2 → hgitaly-18.5.4}/hgitaly/service/commit.py

@@ -7,6 +7,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 import itertools
 import logging
+import threading
 
 from grpc import StatusCode
 from google.protobuf.timestamp_pb2 import Timestamp
@@ -594,10 +595,16 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
 
         logger = LoggerAdapter(base_logger, context)
         req_log = message.Logging(request)
+        stop_event = threading.Event()
 
         if request.limit == 0:
             return
 
+        def on_rpc_done():
+            stop_event.set()
+
+        context.add_callback(on_rpc_done)
+
         repo = self.load_repo(request.repository, context)
         pats = request.paths
         # XXX: raise error if one of the path given is an empty string
@@ -621,6 +628,10 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
         walk_opts = logcmdutil.parseopts(repo.ui, pats, opts)
         revs, _ = logcmdutil.getrevs(repo, walk_opts)
 
+        if stop_event.is_set():  # pragma no cover (hard to test)
+            logger.info("Request %r cancelled!", req_log)
+            return
+
         if request.offset > 0:
             revs = revs.slice(request.offset, len(revs))
 
@@ -638,6 +649,10 @@ class CommitServicer(CommitServiceServicer, HGitalyServicer):
 
         with_short_stats = request.include_shortstat
         for chunk in chunked(revs):
+            if stop_event.is_set():  # pragma no cover (hard to test)
+                logger.info("Request %r cancelled!", req_log)
+                return
+
             yield FindCommitsResponse(
                 commits=(message.commit(repo[rev],
                                         include_referenced_by=incl_ref_by,

{hgitaly-18.5.2 → hgitaly-18.5.4}/hgitaly/tests/test_identification.py

@@ -5,6 +5,7 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from pathlib import Path
 from .. import identification
 
 
@@ -13,14 +14,15 @@ def test_incarnation_id():
 
 
 def test_ensure_client_id(tmpdir):
+    path = Path(tmpdir / 'client-id')
     identification.CLIENT_ID = None  # can have been set by another test
 
-    identification.ensure_client_id(tmpdir)
+    identification.ensure_client_id(path)
     client_id = identification.CLIENT_ID
 
     assert len(client_id.split('-')) == 5
 
     identification.CLIENT_ID = None
-    identification.ensure_client_id(tmpdir)
+    identification.ensure_client_id(path)
 
     assert identification.CLIENT_ID == client_id

{hgitaly-18.5.2 → hgitaly-18.5.4}/hgitaly/tests/test_messages.py

@@ -30,7 +30,7 @@ def test_tag(tmpdir):
     # the factory function doesn't even need the tag to actually exist
     tag = message.tag(b'v3.2.1', ctx)
     assert tag.name == b'v3.2.1'
-    assert not tag.id
+    assert tag.id == ctx.hex().decode()
     assert not tag.message
     assert not tag.message_size
     assert tag.tagger == CommitAuthor()

{hgitaly-18.5.2 → hgitaly-18.5.4/hgitaly.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hgitaly
-Version: 18.5.2
+Version: 18.5.4
 Summary: Server-side implementation of Gitaly protocol for Mercurial
 Home-page: https://foss.heptapod.net/heptapod/hgitaly
 Author: Georges Racinet
@@ -10,10 +10,10 @@ Keywords: hg mercurial heptapod gitlab
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: heptapod>=5.4.0
+Requires-Dist: heptapod~=5.4.0
 Requires-Dist: protobuf~=6.31.1
-Requires-Dist: grpcio~=1.75.0
-Requires-Dist: grpcio-status~=1.75.0
+Requires-Dist: grpcio~=1.76.0
+Requires-Dist: grpcio-status~=1.76.0
 Requires-Dist: grpc-interceptor
 Requires-Dist: grpcio-health-checking
 Requires-Dist: hg-loggingmod>=0.4.1

{hgitaly-18.5.2 → hgitaly-18.5.4}/hgitaly.egg-info/requires.txt

@@ -1,7 +1,7 @@
-heptapod>=5.4.0
+heptapod~=5.4.0
 protobuf~=6.31.1
-grpcio~=1.75.0
-grpcio-status~=1.75.0
+grpcio~=1.76.0
+grpcio-status~=1.76.0
 grpc-interceptor
 grpcio-health-checking
 hg-loggingmod>=0.4.1

{hgitaly-18.5.2 → hgitaly-18.5.4}/install-requirements.txt

@@ -1,7 +1,7 @@
-heptapod>=5.4.0
+heptapod~=5.4.0
 protobuf~=6.31.1
-grpcio~=1.75.0
-grpcio-status~=1.75.0
+grpcio~=1.76.0
+grpcio-status~=1.76.0
 grpc-interceptor
 grpcio-health-checking
 hg-loggingmod>=0.4.1

{hgitaly-18.5.2 → hgitaly-18.5.4}/tests_with_gitaly/test_ref.py

@@ -490,15 +490,12 @@ def test_find_tag(gitaly_rhgitaly_comparison, hg_server):
 
     def normalize_response(rpc_helper, resp, **kw):
         normalize_commit_message(resp.tag.target_commit)
-        # no tag ids in Mercurial until we can assign a tagging changeset
-        # (requires a long-term core change)
-        resp.tag.id = ''
 
     rpc_helper = fixture.rpc_helper(
         hg_server=hg_server,
         stub_cls=RefServiceStub,
         method_name='FindTag',
-        response_sha_attrs=['tag.target_commit.id'],
+        response_sha_attrs=['tag.target_commit.id', 'tag.id'],
         request_cls=FindTagRequest,
         normalizer=normalize_response,
     )

hgitaly-18.5.2/hgitaly/VERSION

@@ -1 +0,0 @@
-18.5.2