Merge ~pappacena/launchpad:git-repo-async-privacy into launchpad:master

[Thiago F. Pappacena]

Doing repository privacy change in background, and blocking user from changing it while another change is in progress.

[Thiago F. Pappacena (pappacena)]

This MP is already quite big, so I'll create in another MP the garbo job that will deal with GitRepositories that are PENDING_INFORMATION_TYPE_TRANSITION for too long (to avoid blocking them forever).

[Ioana Lasc (ilasc)]

LGTM

review: Approve

974b22a... by Thiago F. Pappacena on 2020-10-29

Fixing test

[Colin Watson (cjwatson)]

I think this is mostly OK, but I wonder if it could be even better. Instead of adding a new item to GitRepositoryStatus, have you considered just checking whether there's a pending job of the appropriate type, a bit like GitRepository.pending_updates? That would have the advantage that there'd be no need for a garbo job (https://code.launchpad.net/~pappacena/launchpad/+git/launchpad/+merge/392809) to clean things up if the information-type-changing job fails: it would just automatically become available again, which feels like a cleaner design.

review: Needs Information

826cbad... by Thiago F. Pappacena on 2020-11-05

Encapsulating GitRepository.pending_change_information_type

eeeb231... by Thiago F. Pappacena on 2020-11-05

Renaming GitRepo information type change job

2493c1d... by Thiago F. Pappacena on 2020-11-05

Changing exception msg when blocking info type transition for git repo

[Thiago F. Pappacena (pappacena)]

Pushed the requested changes.

I thought about just checking on-the-fly for unfinished jobs, but didn't go that way because it could be slightly expensive to run such query. But we do that in so few places that I agree it doesn't worth to concentrate that check in a garbo job. I have changed it too.

Unmerged commits

2493c1d... by Thiago F. Pappacena on 2020-11-05

Changing exception msg when blocking info type transition for git repo

eeeb231... by Thiago F. Pappacena on 2020-11-05

Renaming GitRepo information type change job

826cbad... by Thiago F. Pappacena on 2020-11-05

Encapsulating GitRepository.pending_change_information_type

974b22a... by Thiago F. Pappacena on 2020-10-29

Fixing test

4bd7dcc... by Thiago F. Pappacena on 2020-10-26

Fixing configuration of info type transition job

76e0272... by Thiago F. Pappacena on 2020-10-23

Blocking at the UI information type change while it is already changing

caf2673... by Thiago F. Pappacena on 2020-10-23

Adding tests for async GitRepo.transitionToInformationType

3a5e053... by Thiago F. Pappacena on 2020-10-23

Changing GitRepo.transitionInformationType method to be async

diff --git a/database/schema/security.cfg b/database/schema/security.cfg
index 11aba6f..290e7bc 100644
--- a/database/schema/security.cfg
+++ b/database/schema/security.cfg
@@ -2082,6 +2082,24 @@ public.webhookjob                       = SELECT, INSERT
 public.xref                             = SELECT, INSERT, DELETE
 type=user
 
+[privacy-change-jobs]
+groups=script
+public.accessartifact                   = SELECT, UPDATE, DELETE, INSERT
+public.accessartifactgrant              = SELECT, UPDATE, DELETE, INSERT
+public.accesspolicyartifact             = SELECT, UPDATE, DELETE, INSERT
+public.accesspolicygrant                = SELECT, UPDATE, DELETE
+public.account                          = SELECT
+public.distribution                     = SELECT
+public.gitjob                           = SELECT, UPDATE
+public.gitrepository                    = SELECT, UPDATE
+public.gitsubscription                  = SELECT, UPDATE, DELETE
+public.job                              = SELECT, INSERT, UPDATE
+public.person                           = SELECT
+public.product                          = SELECT
+public.sharingjob                       = SELECT, INSERT, UPDATE
+public.teamparticipation                = SELECT
+type=user
+
 [sharing-jobs]
 groups=script
 public.accessartifactgrant              = SELECT, UPDATE, DELETE
diff --git a/lib/lp/app/widgets/itemswidgets.py b/lib/lp/app/widgets/itemswidgets.py
index 1dbb59f..a644a96 100644
--- a/lib/lp/app/widgets/itemswidgets.py
+++ b/lib/lp/app/widgets/itemswidgets.py
@@ -189,25 +189,29 @@ class LaunchpadRadioWidgetWithDescription(LaunchpadRadioWidget):
         """Render an item of the list."""
         text = html_escape(text)
         id = '%s.%s' % (name, index)
+        extra_attr = {"disabled": "disabled"} if self.context.readonly else {}
         elem = renderElement(u'input',
                              value=value,
                              name=name,
                              id=id,
                              cssClass=cssClass,
-                             type='radio')
+                             type='radio',
+                             **extra_attr)
         return self._renderRow(text, value, id, elem)
 
     def renderSelectedItem(self, index, text, value, name, cssClass):
         """Render a selected item of the list."""
         text = html_escape(text)
         id = '%s.%s' % (name, index)
+        extra_attr = {"disabled": "disabled"} if self.context.readonly else {}
         elem = renderElement(u'input',
                              value=value,
                              name=name,
                              id=id,
                              cssClass=cssClass,
                              checked="checked",
-                             type='radio')
+                             type='radio',
+                             **extra_attr)
         return self._renderRow(text, value, id, elem)
 
     def renderExtraHint(self):
diff --git a/lib/lp/code/browser/gitrepository.py b/lib/lp/code/browser/gitrepository.py
index 2552ffb..1ec1b16 100644
--- a/lib/lp/code/browser/gitrepository.py
+++ b/lib/lp/code/browser/gitrepository.py
@@ -483,6 +483,8 @@ class GitRepositoryView(InformationTypePortletMixin, LaunchpadView,
     def warning_message(self):
         if self.context.status == GitRepositoryStatus.CREATING:
             return "This repository is being created."
+        if self.context.pending_change_information_type:
+            return "This repository's information type is being changed."
         return None
 
     @property
@@ -573,6 +575,7 @@ class GitRepositoryEditFormView(LaunchpadEditFormView):
     @cachedproperty
     def schema(self):
         info_types = self.getInformationTypesToShow()
+        read_only_info_type = self.context.pending_change_information_type
 
         class GitRepositoryEditSchema(Interface):
             """Defines the fields for the edit form.
@@ -582,7 +585,8 @@ class GitRepositoryEditFormView(LaunchpadEditFormView):
             """
             use_template(IGitRepository, include=["default_branch"])
             information_type = copy_field(
-                IGitRepository["information_type"], readonly=False,
+                IGitRepository["information_type"],
+                readonly=read_only_info_type,
                 vocabulary=InformationTypeVocabulary(types=info_types))
             name = copy_field(IGitRepository["name"], readonly=False)
             owner = copy_field(IGitRepository["owner"], readonly=False)
@@ -785,6 +789,10 @@ class GitRepositoryEditView(CodeEditOwnerMixin, GitRepositoryEditFormView):
             self.widgets["target"].hint = (
                 "This is the default repository for this target, so it "
                 "cannot be moved to another target.")
+        if self.context.pending_change_information_type:
+            self.widgets["information_type"].hint = (
+                "The information type is being changed. The operation needs "
+                "to finish before you can change it again.")
         if self.context.default_branch:
             self.widgets['default_branch'].context.required = True
 
diff --git a/lib/lp/code/browser/tests/test_branchmergeproposal.py b/lib/lp/code/browser/tests/test_branchmergeproposal.py
index f2ec4ec..83c51dc 100644
--- a/lib/lp/code/browser/tests/test_branchmergeproposal.py
+++ b/lib/lp/code/browser/tests/test_branchmergeproposal.py
@@ -2336,7 +2336,7 @@ class TestLatestProposalsForEachBranchGit(
 
     @staticmethod
     def _setBranchInvisible(branch):
-        removeSecurityProxy(branch.repository).transitionToInformationType(
+        removeSecurityProxy(branch.repository)._transitionToInformationType(
             InformationType.USERDATA, branch.owner, verify_policy=False)
 
 
diff --git a/lib/lp/code/browser/tests/test_gitrepository.py b/lib/lp/code/browser/tests/test_gitrepository.py
index 262d038..13a3a16 100644
--- a/lib/lp/code/browser/tests/test_gitrepository.py
+++ b/lib/lp/code/browser/tests/test_gitrepository.py
@@ -60,6 +60,9 @@ from lp.code.enums import (
     GitRepositoryType,
     )
 from lp.code.interfaces.gitcollection import IGitCollection
+from lp.code.interfaces.gitjob import (
+    IGitRepositoryChangeInformationTypeJobSource,
+    )
 from lp.code.interfaces.gitrepository import IGitRepositorySet
 from lp.code.interfaces.revision import IRevisionSet
 from lp.code.model.gitjob import GitRefScanJob
@@ -161,6 +164,15 @@ class TestGitRepositoryView(BrowserTestCase):
         self.assertTextMatchesExpressionIgnoreWhitespace(
             r"""This repository is being created\..*""", text)
 
+    def test_changing_info_type_warning_message_is_present(self):
+        repository = removeSecurityProxy(self.factory.makeGitRepository())
+        repository.transitionToInformationType(
+            InformationType.PRIVATESECURITY, repository.owner)
+        text = self.getMainText(repository, "+index", user=repository.owner)
+        self.assertTextMatchesExpressionIgnoreWhitespace(
+            r"""This repository's information type is being changed\..*""",
+            text)
+
     def test_creating_warning_message_is_not_shown(self):
         repository = removeSecurityProxy(self.factory.makeGitRepository())
         repository.status = GitRepositoryStatus.AVAILABLE
@@ -1185,8 +1197,54 @@ class TestGitRepositoryEditView(TestCaseWithFactory):
         browser.getControl("Private", index=1).click()
         browser.getControl("Change Git Repository").click()
         with person_logged_in(person):
-            self.assertEqual(
-                InformationType.USERDATA, repository.information_type)
+            self.assertTrue(repository.pending_change_information_type)
+            job_util = getUtility(
+                IGitRepositoryChangeInformationTypeJobSource)
+            jobs = list(job_util.iterReady())
+            self.assertEqual(1, len(jobs))
+            job = removeSecurityProxy(jobs[0])
+            self.assertEqual(repository, job.repository)
+            self.assertEqual(InformationType.USERDATA, job.information_type)
+            self.assertEqual(admin, job.user)
+
+    def test_information_type_in_ui_blocked_if_already_changing(self):
+        # The information_type of a repository can't be changed via the UI
+        # if the repository is already pending a info type change.
+        person = self.factory.makePerson()
+        repository = self.factory.makeGitRepository(owner=person)
+        with admin_logged_in():
+            repository.transitionToInformationType(
+                InformationType.PRIVATESECURITY, repository.owner)
+            # There should be 1 job pending to be executed.
+            job_util = getUtility(
+                IGitRepositoryChangeInformationTypeJobSource)
+            jobs = list(job_util.iterReady())
+            self.assertEqual(1, len(jobs))
+        admin = getUtility(ILaunchpadCelebrities).admin.teamowner
+        browser = self.getUserBrowser(
+            canonical_url(repository) + "/+edit", user=admin)
+        # Make sure the privacy controls are all disabled in the UI.
+        controls = [
+            "Public", "Public Security", "Private Security", "Private",
+            "Proprietary", "Embargoed"]
+        self.assertTrue(
+            all(browser.getControl(i, index=0).disabled for i in controls))
+        expected_msg = (
+            "The information type is being changed. The operation needs to "
+            "finish before you can change it again.")
+        self.assertIn(expected_msg, extract_text(browser.contents))
+
+        # Trying to change should have no effect in the backend, since the
+        # repository is already changing info type and this field is read-only.
+        browser.getControl("Private", index=1).click()
+        browser.getControl("Change Git Repository").click()
+        with person_logged_in(person):
+            self.assertTrue(repository.pending_change_information_type)
+            # It should have the same job it already had.
+            job_util = getUtility(
+                IGitRepositoryChangeInformationTypeJobSource)
+            new_jobs = list(job_util.iterReady())
+            self.assertEqual(jobs, new_jobs)
 
     def test_edit_view_ajax_render(self):
         # An information type change request is processed as expected when
@@ -1208,8 +1266,16 @@ class TestGitRepositoryEditView(TestCaseWithFactory):
                 person, repository.target, repository, view]
             result = view.render()
             self.assertEqual("", result)
+            self.assertTrue(repository.pending_change_information_type)
+            job_util = getUtility(
+                IGitRepositoryChangeInformationTypeJobSource)
+            jobs = list(job_util.iterReady())
+            self.assertEqual(1, len(jobs))
+            job = removeSecurityProxy(jobs[0])
+            self.assertEqual(repository, job.repository)
             self.assertEqual(
-                repository.information_type, InformationType.PUBLICSECURITY)
+                InformationType.PUBLICSECURITY, job.information_type)
+            self.assertEqual(person, job.user)
 
     def test_change_default_branch(self):
         # An authorised user can change the default branch to one that
diff --git a/lib/lp/code/configure.zcml b/lib/lp/code/configure.zcml
index 898e645..3b03c7d 100644
--- a/lib/lp/code/configure.zcml
+++ b/lib/lp/code/configure.zcml
@@ -1111,6 +1111,11 @@
       provides="lp.code.interfaces.gitjob.IGitRepositoryModifiedMailJobSource">
     <allow interface="lp.code.interfaces.gitjob.IGitRepositoryModifiedMailJobSource" />
   </securedutility>
+  <securedutility
+      component="lp.code.model.gitjob.GitRepositoryChangeInformationTypeJob"
+      provides="lp.code.interfaces.gitjob.IGitRepositoryChangeInformationTypeJobSource">
+    <allow interface="lp.code.interfaces.gitjob.IGitRepositoryChangeInformationTypeJobSource" />
+  </securedutility>
   <class class="lp.code.model.gitjob.GitRefScanJob">
     <allow interface="lp.code.interfaces.gitjob.IGitJob" />
     <allow interface="lp.code.interfaces.gitjob.IGitRefScanJob" />
@@ -1123,6 +1128,10 @@
     <allow interface="lp.code.interfaces.gitjob.IGitJob" />
     <allow interface="lp.code.interfaces.gitjob.IGitRepositoryModifiedMailJob" />
   </class>
+  <class class="lp.code.model.gitjob.GitRepositoryChangeInformationTypeJob">
+    <allow interface="lp.code.interfaces.gitjob.IGitJob" />
+    <allow interface="lp.code.interfaces.gitjob.IGitRepositoryChangeInformationTypeJob" />
+  </class>
 
   <lp:help-folder folder="help" name="+help-code" />
 
diff --git a/lib/lp/code/interfaces/gitjob.py b/lib/lp/code/interfaces/gitjob.py
index 4f31b19..4bbca04 100644
--- a/lib/lp/code/interfaces/gitjob.py
+++ b/lib/lp/code/interfaces/gitjob.py
@@ -1,4 +1,4 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2015-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """GitJob interfaces."""
@@ -11,6 +11,8 @@ __all__ = [
     'IGitRefScanJobSource',
     'IGitRepositoryModifiedMailJob',
     'IGitRepositoryModifiedMailJobSource',
+    'IGitRepositoryChangeInformationTypeJob',
+    'IGitRepositoryChangeInformationTypeJobSource',
     'IReclaimGitRepositorySpaceJob',
     'IReclaimGitRepositorySpaceJobSource',
     ]
@@ -93,3 +95,20 @@ class IGitRepositoryModifiedMailJobSource(IJobSource):
         :param repository_delta: An `IGitRepositoryDelta` describing the
             changes.
         """
+
+
+class IGitRepositoryChangeInformationTypeJob(IRunnableJob):
+    """A Job to change repository's information type."""
+
+
+class IGitRepositoryChangeInformationTypeJobSource(IJobSource):
+
+    def create(repository, user, information_type, verify_policy=True):
+        """Create a job to change git repository's information type.
+
+        :param repository: The `IGitRepository` that was modified.
+        :param information_type: The `InformationType` to transition to.
+        :param user: The `IPerson` who is making the change.
+        :param verify_policy: Check if the new information type complies
+            with the `IGitNamespacePolicy`.
+        """
diff --git a/lib/lp/code/interfaces/gitrepository.py b/lib/lp/code/interfaces/gitrepository.py
index 192133a..dac0e8f 100644
--- a/lib/lp/code/interfaces/gitrepository.py
+++ b/lib/lp/code/interfaces/gitrepository.py
@@ -582,6 +582,10 @@ class IGitRepositoryView(IHasRecipes):
         "Whether there are recent changes in this repository that have not "
         "yet been scanned.")
 
+    pending_change_information_type = Attribute(
+        "Whether there is a pending request to change the information type "
+        "of this repository that have not been processed yet.")
+
     def updateMergeCommitIDs(paths):
         """Update commit SHA1s of merge proposals for this repository.
 
diff --git a/lib/lp/code/model/gitjob.py b/lib/lp/code/model/gitjob.py
index 1eb87da..f1e3d2a 100644
--- a/lib/lp/code/model/gitjob.py
+++ b/lib/lp/code/model/gitjob.py
@@ -33,10 +33,12 @@ from zope.interface import (
     provider,
     )
 
+from lp.app.enums import InformationType
 from lp.app.errors import NotFoundError
 from lp.code.enums import (
     GitActivityType,
     GitPermissionType,
+    GitRepositoryStatus,
     )
 from lp.code.interfaces.githosting import IGitHostingClient
 from lp.code.interfaces.gitjob import (
@@ -45,6 +47,8 @@ from lp.code.interfaces.gitjob import (
     IGitRefScanJobSource,
     IGitRepositoryModifiedMailJob,
     IGitRepositoryModifiedMailJobSource,
+    IGitRepositoryChangeInformationTypeJob,
+    IGitRepositoryChangeInformationTypeJobSource,
     IReclaimGitRepositorySpaceJob,
     IReclaimGitRepositorySpaceJobSource,
     )
@@ -100,6 +104,13 @@ class GitJobType(DBEnumeratedType):
         modifications.
         """)
 
+    REPOSITORY_TRANSITION_TO_INFO_TYPE = DBItem(3, """
+        Change repository's information type
+
+        This job runs when a user requests to change privacy settings of a
+        repository.
+    """)
+
 
 @implementer(IGitJob)
 class GitJob(StormBase):
@@ -393,3 +404,49 @@ class GitRepositoryModifiedMailJob(GitJobDerived):
     def run(self):
         """See `IGitRepositoryModifiedMailJob`."""
         self.getMailer().sendAll()
+
+
+@implementer(IGitRepositoryChangeInformationTypeJob)
+@provider(IGitRepositoryChangeInformationTypeJobSource)
+class GitRepositoryChangeInformationTypeJob(GitJobDerived):
+    """A Job to change git repository's information type."""
+
+    class_job_type = GitJobType.REPOSITORY_TRANSITION_TO_INFO_TYPE
+
+    config = config.IGitRepositoryChangeInformationTypeJobSource
+
+    @classmethod
+    def create(cls, repository, information_type, user, verify_policy=True):
+        """See `IGitRepositoryChangeInformationTypeJobSource`."""
+        metadata = {
+            "user": user.id,
+            "information_type": information_type.value,
+            "verify_policy": verify_policy,
+            }
+        git_job = GitJob(repository, cls.class_job_type, metadata)
+        job = cls(git_job)
+        job.celeryRunOnCommit()
+        return job
+
+    @property
+    def user(self):
+        return getUtility(IPersonSet).get(self.metadata["user"])
+
+    @property
+    def verify_policy(self):
+        return self.metadata["verify_policy"]
+
+    @property
+    def information_type(self):
+        return InformationType.items[self.metadata["information_type"]]
+
+    def run(self):
+        """See `IGitRepositoryChangeInformationTypeJob`."""
+        if not self.repository.pending_change_information_type:
+            raise AttributeError(
+                "The repository %s is not pending information type change." %
+                self.repository)
+
+        self.repository._transitionToInformationType(
+            self.information_type, self.user, self.verify_policy)
+        self.repository.status = GitRepositoryStatus.AVAILABLE
diff --git a/lib/lp/code/model/gitref.py b/lib/lp/code/model/gitref.py
index f7dc142..e2f788d 100644
--- a/lib/lp/code/model/gitref.py
+++ b/lib/lp/code/model/gitref.py
@@ -180,7 +180,7 @@ class GitRefMixin:
 
     def transitionToInformationType(self, information_type, user,
                                     verify_policy=True):
-        return self.repository.transitionToInformationType(
+        return self.repository._transitionToInformationType(
             information_type, user, verify_policy=verify_policy)
 
     @property
diff --git a/lib/lp/code/model/gitrepository.py b/lib/lp/code/model/gitrepository.py
index fb5e703..d5bd382 100644
--- a/lib/lp/code/model/gitrepository.py
+++ b/lib/lp/code/model/gitrepository.py
@@ -117,7 +117,10 @@ from lp.code.interfaces.gitcollection import (
     IGitCollection,
     )
 from lp.code.interfaces.githosting import IGitHostingClient
-from lp.code.interfaces.gitjob import IGitRefScanJobSource
+from lp.code.interfaces.gitjob import (
+    IGitRefScanJobSource,
+    IGitRepositoryChangeInformationTypeJobSource,
+    )
 from lp.code.interfaces.gitlookup import IGitLookup
 from lp.code.interfaces.gitnamespace import (
     get_git_namespace,
@@ -882,6 +885,28 @@ class GitRepository(StormBase, WebhookTargetMixin, GitIdentityMixin):
     def transitionToInformationType(self, information_type, user,
                                     verify_policy=True):
         """See `IGitRepository`."""
+        error_msg = None
+        if self.status != GitRepositoryStatus.AVAILABLE:
+            error_msg = ("Cannot change privacy settings while git "
+                         "repository is being created.")
+        elif self.pending_change_information_type:
+            error_msg = ("Cannot change privacy settings while git repository "
+                         "is pending another information type change.")
+        if error_msg is not None:
+            raise CannotChangeInformationType(error_msg)
+        util = getUtility(
+            IGitRepositoryChangeInformationTypeJobSource)
+        return util.create(self, information_type, user, verify_policy)
+
+    def _transitionToInformationType(self, information_type, user,
+                                    verify_policy=True):
+        """Synchronously make the change in this repository's information
+        type.
+
+        External callers should use the async, public version of this
+        method, since it deals with the side effects of changing
+        repository's privacy changes.
+        """
         if self.information_type == information_type:
             return
         if (verify_policy and
@@ -1120,21 +1145,29 @@ class GitRepository(StormBase, WebhookTargetMixin, GitIdentityMixin):
         """See `IGitRepository`."""
         return self.namespace.areRepositoriesMergeable(self, other)
 
-    @property
-    def pending_updates(self):
-        """See `IGitRepository`."""
-        from lp.code.model.gitjob import (
-            GitJob,
-            GitJobType,
-            )
+    def hasPendingJob(self, job_type):
+        from lp.code.model.gitjob import GitJob
         jobs = Store.of(self).find(
             GitJob,
             GitJob.repository == self,
-            GitJob.job_type == GitJobType.REF_SCAN,
+            GitJob.job_type == job_type,
             GitJob.job == Job.id,
             Job._status.is_in([JobStatus.WAITING, JobStatus.RUNNING]))
         return not jobs.is_empty()
 
+    @property
+    def pending_updates(self):
+        """See `IGitRepository`."""
+        from lp.code.model.gitjob import GitJobType
+        return self.hasPendingJob(GitJobType.REF_SCAN)
+
+    @property
+    def pending_change_information_type(self):
+        """See `IGitRepository`."""
+        from lp.code.model.gitjob import GitJobType
+        return self.hasPendingJob(
+            GitJobType.REPOSITORY_TRANSITION_TO_INFO_TYPE)
+
     def updateMergeCommitIDs(self, paths):
         """See `IGitRepository`."""
         store = Store.of(self)
diff --git a/lib/lp/code/model/tests/test_gitcollection.py b/lib/lp/code/model/tests/test_gitcollection.py
index 447fcb4..372a633 100644
--- a/lib/lp/code/model/tests/test_gitcollection.py
+++ b/lib/lp/code/model/tests/test_gitcollection.py
@@ -599,7 +599,7 @@ class TestBranchMergeProposals(TestCaseWithFactory):
         registrant = self.factory.makePerson()
         mp1 = self.factory.makeBranchMergeProposalForGit(registrant=registrant)
         naked_repository = removeSecurityProxy(mp1.target_git_repository)
-        naked_repository.transitionToInformationType(
+        naked_repository._transitionToInformationType(
             InformationType.USERDATA, registrant, verify_policy=False)
         collection = self.all_repositories.visibleByUser(None)
         proposals = collection.getMergeProposals()
diff --git a/lib/lp/code/model/tests/test_gitjob.py b/lib/lp/code/model/tests/test_gitjob.py
index 3f606c0..b4487b9 100644
--- a/lib/lp/code/model/tests/test_gitjob.py
+++ b/lib/lp/code/model/tests/test_gitjob.py
@@ -25,13 +25,16 @@ from testtools.matchers import (
     MatchesStructure,
     )
 import transaction
+from zope.component import getUtility
 from zope.interface import providedBy
 from zope.security.proxy import removeSecurityProxy
 
+from lp.app.enums import InformationType
 from lp.code.adapters.gitrepository import GitRepositoryDelta
 from lp.code.enums import (
     GitGranteeType,
     GitObjectType,
+    GitRepositoryStatus,
     )
 from lp.code.interfaces.branchmergeproposal import (
     BRANCH_MERGE_PROPOSAL_WEBHOOKS_FEATURE_FLAG,
@@ -39,6 +42,7 @@ from lp.code.interfaces.branchmergeproposal import (
 from lp.code.interfaces.gitjob import (
     IGitJob,
     IGitRefScanJob,
+    IGitRepositoryChangeInformationTypeJobSource,
     IReclaimGitRepositorySpaceJob,
     )
 from lp.code.model.gitjob import (
@@ -47,9 +51,11 @@ from lp.code.model.gitjob import (
     GitJobDerived,
     GitJobType,
     GitRefScanJob,
+    GitRepositoryChangeInformationTypeJob,
     ReclaimGitRepositorySpaceJob,
     )
 from lp.code.tests.helpers import GitHostingFixture
+from lp.registry.errors import CannotChangeInformationType
 from lp.services.config import config
 from lp.services.database.constants import UTC_NOW
 from lp.services.features.testing import FeatureFixture
@@ -362,6 +368,59 @@ class TestReclaimGitRepositorySpaceJob(TestCaseWithFactory):
         self.assertEqual([(path,)], hosting_fixture.delete.extract_args())
 
 
+class TestGitRepositoryTransitionInformationType(TestCaseWithFactory):
+
+    layer = ZopelessDatabaseLayer
+
+    def test_block_multiple_requests_to_change_info_type(self):
+        repo = self.factory.makeGitRepository()
+        repo.transitionToInformationType(
+            InformationType.PRIVATESECURITY, repo.owner)
+        self.assertTrue(repo.pending_change_information_type)
+        expected_msg = (
+            "Cannot change privacy settings while git repository is "
+            "pending another information type change.")
+        self.assertRaisesRegex(
+            CannotChangeInformationType, expected_msg,
+            repo.transitionToInformationType,
+            InformationType.PROPRIETARY, repo.owner)
+
+    def test_avoid_transitioning_while_creating(self):
+        repo = self.factory.makeGitRepository()
+        removeSecurityProxy(repo).status = GitRepositoryStatus.CREATING
+        expected_msg = (
+            "Cannot change privacy settings while git repository is "
+            "being created.")
+        self.assertRaisesRegex(
+            CannotChangeInformationType, expected_msg,
+            repo.transitionToInformationType,
+            InformationType.PROPRIETARY, repo.owner)
+
+    def test_run_changes_info_type(self):
+        repo = self.factory.makeGitRepository(
+            information_type=InformationType.PUBLIC)
+        # Change to a private info type and with verify_policy, so we hit as
+        # many database tables as possible.
+        repo.transitionToInformationType(
+            InformationType.PRIVATESECURITY, repo.owner, verify_policy=True)
+        self.assertTrue(repo.pending_change_information_type)
+
+        job_util = getUtility(
+            IGitRepositoryChangeInformationTypeJobSource)
+        jobs = list(job_util.iterReady())
+        self.assertEqual(1, len(jobs))
+        with dbuser(GitRepositoryChangeInformationTypeJob.config.dbuser):
+            JobRunner(jobs).runAll()
+
+        self.assertEqual(GitRepositoryStatus.AVAILABLE, repo.status)
+        self.assertEqual(
+            InformationType.PRIVATESECURITY, repo.information_type)
+
+        # After the job finished, another change is possible.
+        repo.transitionToInformationType(InformationType.PUBLIC, repo.owner)
+        self.assertTrue(repo.pending_change_information_type)
+
+
 class TestDescribeRepositoryDelta(TestCaseWithFactory):
     """Tests for `describe_repository_delta`."""
 
diff --git a/lib/lp/code/model/tests/test_gitrepository.py b/lib/lp/code/model/tests/test_gitrepository.py
index b83f9da..f0ba2b4 100644
--- a/lib/lp/code/model/tests/test_gitrepository.py
+++ b/lib/lp/code/model/tests/test_gitrepository.py
@@ -809,7 +809,7 @@ class TestGitRepositoryDeletion(TestCaseWithFactory):
 
     def test_private_subscription_does_not_disable_deletion(self):
         # A private repository that has a subscription can be deleted.
-        self.repository.transitionToInformationType(
+        removeSecurityProxy(self.repository)._transitionToInformationType(
             InformationType.USERDATA, self.repository.owner,
             verify_policy=False)
         self.repository.subscribe(
@@ -2054,8 +2054,7 @@ class TestGitRepositoryModerate(TestCaseWithFactory):
             project.setBranchSharingPolicy(BranchSharingPolicy.PUBLIC)
             repository.transitionToInformationType(
                 InformationType.PRIVATESECURITY, project.owner)
-            self.assertEqual(
-                InformationType.PRIVATESECURITY, repository.information_type)
+            self.assertTrue(repository.pending_change_information_type)
 
     def test_attribute_smoketest(self):
         # Users with launchpad.Moderate can set attributes.
@@ -3454,7 +3453,7 @@ class TestGitRepositorySet(TestCaseWithFactory):
             ]
         for repository, modified_date in zip(repositories, modified_dates):
             removeSecurityProxy(repository).date_last_modified = modified_date
-        removeSecurityProxy(repositories[0]).transitionToInformationType(
+        removeSecurityProxy(repositories[0])._transitionToInformationType(
             InformationType.PRIVATESECURITY, repositories[0].registrant)
         self.assertEqual(
             [repositories[3], repositories[4], repositories[1],
@@ -3966,8 +3965,7 @@ class TestGitRepositoryWebservice(TestCaseWithFactory):
             json.dumps({"information_type": "Public Security"}))
         self.assertEqual(209, response.status)
         with person_logged_in(ANONYMOUS):
-            self.assertEqual(
-                InformationType.PUBLICSECURITY, repository_db.information_type)
+            self.assertTrue(repository_db.pending_change_information_type)
 
     def test_set_information_type_other_person(self):
         # An unrelated user cannot change the information type.
diff --git a/lib/lp/code/xmlrpc/tests/test_git.py b/lib/lp/code/xmlrpc/tests/test_git.py
index dcbcee6..e884cd2 100644
--- a/lib/lp/code/xmlrpc/tests/test_git.py
+++ b/lib/lp/code/xmlrpc/tests/test_git.py
@@ -899,7 +899,7 @@ class TestGitAPI(TestGitAPIMixin, TestCaseWithFactory):
             for _ in range(2)]
         private_repository = code_imports[0].git_repository
         removeSecurityProxy(
-            private_repository).transitionToInformationType(
+            private_repository)._transitionToInformationType(
             InformationType.PRIVATESECURITY, private_repository.owner)
         with celebrity_logged_in("vcs_imports"):
             jobs = [
@@ -1077,7 +1077,7 @@ class TestGitAPI(TestGitAPIMixin, TestCaseWithFactory):
             for _ in range(2)]
         private_repository = code_imports[0].git_repository
         removeSecurityProxy(
-            private_repository).transitionToInformationType(
+            private_repository)._transitionToInformationType(
             InformationType.PRIVATESECURITY, private_repository.owner)
         with celebrity_logged_in("vcs_imports"):
             jobs = [
@@ -1687,7 +1687,7 @@ class TestGitAPI(TestGitAPIMixin, TestCaseWithFactory):
                 target_rcs_type=TargetRevisionControlSystems.GIT)
             for _ in range(2)]
         private_repository = code_imports[0].git_repository
-        removeSecurityProxy(private_repository).transitionToInformationType(
+        removeSecurityProxy(private_repository)._transitionToInformationType(
             InformationType.PRIVATESECURITY, private_repository.owner)
         with celebrity_logged_in("vcs_imports"):
             jobs = [
@@ -2012,7 +2012,7 @@ class TestGitAPI(TestGitAPIMixin, TestCaseWithFactory):
                 target_rcs_type=TargetRevisionControlSystems.GIT)
             for _ in range(2)]
         private_repository = code_imports[0].git_repository
-        removeSecurityProxy(private_repository).transitionToInformationType(
+        removeSecurityProxy(private_repository)._transitionToInformationType(
             InformationType.PRIVATESECURITY, private_repository.owner)
         with celebrity_logged_in("vcs_imports"):
             jobs = [
@@ -2268,7 +2268,7 @@ class TestGitAPI(TestGitAPIMixin, TestCaseWithFactory):
                 target_rcs_type=TargetRevisionControlSystems.GIT)
             for _ in range(2)]
         private_repository = code_imports[0].git_repository
-        removeSecurityProxy(private_repository).transitionToInformationType(
+        removeSecurityProxy(private_repository)._transitionToInformationType(
             InformationType.PRIVATESECURITY, private_repository.owner)
         with celebrity_logged_in("vcs_imports"):
             jobs = [
diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index aaa9d30..1157cb5 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -1768,6 +1768,7 @@ job_sources:
     ICommercialExpiredJobSource,
     IExpiringMembershipNotificationJobSource,
     IGitRepositoryModifiedMailJobSource,
+    IGitRepositoryChangeInformationTypeJobSource,
     IMembershipNotificationJobSource,
     IOCIRecipeRequestBuildsJobSource,
     IOCIRegistryUploadJobSource,
@@ -1829,6 +1830,11 @@ module: lp.code.interfaces.gitjob
 dbuser: send-branch-mail
 crontab_group: MAIN
 
+[IGitRepositoryChangeInformationTypeJobSource]
+module: lp.code.interfaces.gitjob
+dbuser: privacy-change-jobs
+crontab_group: MAIN
+
 [IInitializeDistroSeriesJobSource]
 module: lp.soyuz.interfaces.distributionjob
 dbuser: initializedistroseries
diff --git a/lib/lp/testing/factory.py b/lib/lp/testing/factory.py
index 57babc5..9d1f53b 100644
--- a/lib/lp/testing/factory.py
+++ b/lib/lp/testing/factory.py
@@ -1815,7 +1815,7 @@ class BareLaunchpadObjectFactory(ObjectFactory):
             reviewer=reviewer, **optional_repository_args)
         naked_repository = removeSecurityProxy(repository)
         if information_type is not None:
-            naked_repository.transitionToInformationType(
+            naked_repository._transitionToInformationType(
                 information_type, registrant, verify_policy=False)
         return repository