Use inodes in snapshots

.gitignore

@@ -29,6 +29,7 @@ __pycache__
 /tezos-codec
 /tezos-snoop
 /tezos-tps-evaluation
+/tezos-tps-evaluation-*
 /tezos-sc-rollup-node-*
 /tezos-sc-rollup-client-*
 

.gitlab/ci/build_release.yml

@@ -2,7 +2,7 @@
 .build_docker_release_template:
   extends:
     - .default_settings_template
-    - .image_template__latest # Docker-in-Docker (dind)
+    - .image_template__docker
     - .docker_registry_auth # Sets up a before_script
   variables:
     IMAGE_ARCH_PREFIX: ""

.gitlab/ci/publish_release.yml

@@ -20,7 +20,7 @@ release-on-gitlab:
 docker:merge_manifests:
   extends:
     - .rules_template__master_and_releases
-    - .image_template__latest # Docker-in-Docker (dind)
+    - .image_template__docker
     - .docker_registry_auth # Sets up a before_script
   stage: publish_release
   # this job does not need artifacts from previous jobs.

.gitlab/ci/templates.yml

@@ -32,28 +32,15 @@ variables:
 .image_template__runtime_prebuild_dependencies_template:
   image: ${build_deps_image_name}:runtime-prebuild-dependencies--${build_deps_image_version}
 
-# We should only use the latest version of Docker for experimental features (ex: docker manifest)
-.image_template__latest:
+# Match GitLab executors version and directly use the Docker socket
+# The Docker daemon is already configured, experimental features are enabled
+# The following environment variables are already set:
+# - BUILDKIT_PROGRESS
+# - DOCKER_DRIVER
+# - DOCKER_VERSION
+# https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#use-docker-socket-binding
+.image_template__docker:
   image: docker:20.10.12
-  services:
-    - name: docker:20.10.12-dind
-      command: ["--experimental"]
-  variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_BUILDKIT: 1
-    BUILDKIT_PROGRESS: plain
-
-# We should use the stable version to build Docker images (this template is not used at the moment)
-# Match the GitLab runners/executors version for Docker-in-Docker
-# https://gitlab.com/nomadic-labs/iac/packer/pck-aws-baseimage/-/blob/master/roles/docker-ubuntu.yaml
-.image_template__stable:
-  image: docker:19.03.15
-  services:
-    - docker:19.03.15-dind
-  variables:
-    DOCKER_DRIVER: overlay2
-    DOCKER_BUILDKIT: 1
-    BUILDKIT_PROGRESS: plain
 
 # Rules template
 

.gitlab/ci/test/tezt.yml

@@ -49,6 +49,15 @@ tezt:build-long:
   script:
     - dune build @tezt/long_tests/check
 
+# Tests tezt itself
+tezt:self_tests:
+  extends:
+    - .build_template
+    - .rules_template__development
+  stage: test
+  script:
+    - dune runtest tezt/self_tests/
+
 # Note: if you reactivate this test and if you keep it manual, put it in the "manual" stage.
 #
 #tezt:manual:migration:

Makefile

@@ -309,6 +309,9 @@ build-tps-deps:
 build-tps: lift-protocol-limits-patch build build-tezt
 	@dune build ./src/bin_tps_evaluation
 	@cp -f ./_build/install/default/bin/tezos-tps-evaluation .
+	@cp -f ./src/bin_tps_evaluation/tezos-tps-evaluation-benchmark-tps .
+	@cp -f ./src/bin_tps_evaluation/tezos-tps-evaluation-estimate-average-block .
+	@cp -f ./src/bin_tps_evaluation/tezos-tps-evaluation-gas-tps .
 
 .PHONY: docker-image-build
 docker-image-build:

docs/Makefile

@@ -1,5 +1,7 @@
 # You can set these variables from the command line.
-SPHINXOPTS    = -j auto -aE -n -W --keep-going
+# FIXME: https://gitlab.com/tezos/tezos/-/issues/2680
+# The [-W] flag is temporary disabled
+SPHINXOPTS    = -j auto -aE -n --keep-going
 SPHINXBUILD   = poetry run sphinx-build
 SPHINXPROJ    = Tezos
 SOURCEDIR     = .
@@ -98,6 +100,10 @@ api/errors.rst: $(DOCERRORDIR)/error_doc.ml
 	@cd .. && dune build docs/$(DOCERRORDIR)/error_doc.exe
 	../_build/default/docs/$(DOCERRORDIR)/error_doc.exe > api/errors.rst
 
+developer/metrics.csv:
+	make -C ../ tezos-node
+	../tezos-node dump-metrics > developer/metrics.csv
+
 $(DOCGENDIR)/rpc_doc.exe:
 	@cd .. && dune build docs/$(DOCGENDIR)/rpc_doc.exe
 
@@ -122,7 +128,7 @@ install-dependencies:
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-html: Makefile api/errors.rst rpc p2p install-dependencies
+html: Makefile api/errors.rst developer/metrics.csv rpc p2p install-dependencies
 	(echo ':orphan:'; echo ''; cat ../CHANGES.rst) > CHANGES-dev.rst
 	@$(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
 	@ln -s active "$(BUILDDIR)/hangzhou" || true
@@ -168,5 +174,5 @@ lint: pylint pycodestyle lint_black
 
 clean:
 	@-rm -Rf "$(BUILDDIR)"
-	@-rm -Rf api/errors.rst active/rpc.rst hangzhou/rpc.rst ithaca/rpc.rst alpha/rpc.rst shell/rpc.rst shell/p2p_api.rst user/default-acl.json CHANGES-dev.rst
+	@-rm -Rf api/errors.rst developer/metrics.csv active/rpc.rst hangzhou/rpc.rst ithaca/rpc.rst alpha/rpc.rst shell/rpc.rst shell/p2p_api.rst user/default-acl.json CHANGES-dev.rst
 	@-rm -Rf api/tezos-*.html api/tezos-*.txt active/tezos-*.html hangzhou/tezos-*.html ithaca/tezos-*.html alpha/tezos-*.html

docs/alpha/consensus.rst

@@ -145,16 +145,14 @@ Validator selection: staking balance, active stake, and frozen deposits
 
 Validator selection is based on the stake, as in Emmy*, with the exception that
 it is based on the delegate's *active stake* instead of its *staking
-balance* (or rather the corresponding rolls.
-**NB**: rolls do not play a
-role anymore, except for establishing a minimum required staking
-balance). Let us first (re)define these and related concepts.
+balance*. Let us first (re)define these and related concepts.
 
 - The *(maximal) staking balance* of a delegate is its full balance (i.e. all the tokens owned by the delegate) plus the
   balances of all accounts that have delegated to it.
+  It must be at least ``TOKENS_PER_ROLL`` tez, otherwise the delegate cannot be selected as a validator.
 - The *active stake* of a delegate is the amount of tez with which
   it participates in consensus. It is at most its
-  staking balance. It must be at least ``TOKEN_PER_ROLL`` tez. We explain below how it is computed.
+  staking balance. We explain below how it is computed.
 - The *frozen deposit* represents a percentage ``FROZEN_DEPOSIT_PERCENTAGE``
   of the maximum active stake during the last ``PRESERVED_CYCLES + MAX_SLASHING_PERIOD``. This amount
   represents the delegate's skin in the game: in the case that the

docs/developer/contributing.rst

@@ -441,11 +441,30 @@ Merge Request "Draft" Mode
 A merge request that is not yet ready for review should be marked
 as `draft <https://docs.gitlab.com/ee/user/project/merge_requests/drafts.html>`_
 by prefixing its title with ``Draft:``.
-On ``tezos/tezos`` draft merge requests are ignored by reviewers.
+On ``tezos/tezos`` draft merge requests that are assigned to their owners
+are ignored by reviewers.
 Marking merge requests as draft hence helps lower
 the number of merge requests that require attention from the
 :doc:`Octez merge team<merge_team>`.
 
+Merge Request's owner
+~~~~~~~~~~~~~~~~~~~~~
+
+Usually the person who has created a Merge Request is also responsible for
+pushing it forward: finding reviewers, addressing their comments and so on.
+Occasionally though it happens that the author has to move to more pressing
+tasks and hands his MR over to another person to finish. This is a problem,
+because an MR assigned to its author has sort of a special status – it
+informs everyone that the branch is likely to change at any moment. When an
+MR is handed over, we lose that important information.
+
+For this reason, when take-over happens, it's useful to make that explicit.
+The person taking over should put a comment informing about this so that
+everyone knows that the person attending to the MR changes. Also the
+description should be updated to reflect that information. It is suggested to
+prefix the description with a line specifying the MR's owner if that's
+different to the author indicated by GitLab.
+
 .. _adding_new_dependencies:
 
 Special case: MRs that introduce a new dependency