Uploaded image for project: 'Infrastructure'
  1. Infrastructure
  2. INFRA-12573

Move ZooKeeper from SVN to Git as primary repo - already have git mirror.

    Details

    • Type: Task
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Fix Version/s: Nov 2016
    • Component/s: Git, Subversion
    • Labels:
      None

      Description

      Hi, I looked at using servicedesk, but the options there seem to assume that you don't already have a git mirror - I could have read it wrong though, if so, sorry about that.

      The ZooKeeper community would like (vote here: http://markmail.org/message/rgivqy5kc2vqjiw4) to migrate from using SVN as our primary development repo

      https://svn.apache.org/repos/asf/zookeeper/

      to using what's currently our r/o mirror

      git://git.apache.org/zookeeper.git

      as our primary development repository. This includes keeping github.com as a r/o mirror - https://github.com/apache/zookeeper We'd also keep our current setup the same wrt mailing list notifications (commits@zookeeper.apache.org) and such.


      I assume this is possible? If so what do we need to do at this point? Can you tell us the steps and what's involved in making the switch? If there's a document available with more information that would also be fine. (I searched but couldn't find anything).

        Issue Links

          Activity

          Hide
          Internal
          hanm Michael Han added a comment -
          Is it possible that this move from svn to git work, in particular, the renaming of the "trunk" branch to "master" would cause the regeneration of commit hash for existing commits? Asking this because we've seen different commit hash for same commit before / after this git move was done. An example:

          After move to git
          https://github.com/rakeshadr/zookeeper-1/commit/d497aac4cf8cf2144a377e46011385b20fc74fa6

          Before move to git:
          https://github.com/autodesk-forks/zookeeper/commit/ebd64c4a9b62876f7054add6a07bd36581916557
          Show
          Internal
          hanm Michael Han added a comment - Is it possible that this move from svn to git work, in particular, the renaming of the "trunk" branch to "master" would cause the regeneration of commit hash for existing commits? Asking this because we've seen different commit hash for same commit before / after this git move was done. An example: After move to git https://github.com/rakeshadr/zookeeper-1/commit/d497aac4cf8cf2144a377e46011385b20fc74fa6 Before move to git: https://github.com/autodesk-forks/zookeeper/commit/ebd64c4a9b62876f7054add6a07bd36581916557
          Hide
          phunt Patrick Hunt added a comment - Reporter
          I think this is good for now. If we need more someone will open another JIRA. Thanks!
          Show
          phunt Patrick Hunt added a comment - Reporter I think this is good for now. If we need more someone will open another JIRA. Thanks!
          Hide
          cml Chris Lambertus added a comment -
          All,

          I am not sure what is being waited on here. I've processed a change to update the svn config to make the site (https://svn.apache.org/repos/asf/zookeeper/site/) read/write while making the rest of the project read only. There isn't anything more to do here that I can see.

          Moving your site to git and off of the CMS is absolutely possible, and we can provide some assistance, but there'll be some work involved on your end. Let's not conflate that with this particular ticket. If you want to do a CMS->git move at a later date, please open a new ticket.
          Show
          cml Chris Lambertus added a comment - All, I am not sure what is being waited on here. I've processed a change to update the svn config to make the site ( https://svn.apache.org/repos/asf/zookeeper/site/ ) read/write while making the rest of the project read only. There isn't anything more to do here that I can see. Moving your site to git and off of the CMS is absolutely possible, and we can provide some assistance, but there'll be some work involved on your end. Let's not conflate that with this particular ticket. If you want to do a CMS->git move at a later date, please open a new ticket.
          Hide
          gmcdonald Gavin added a comment -
          [~pono] ping me on this please and we can finish it off.
          Show
          gmcdonald Gavin added a comment - [~pono] ping me on this please and we can finish it off.
          Hide
          breed Benjamin Reed added a comment -
          I don't really understand the issue. everything in git would be nice but
          does cms work with git?


          Show
          breed Benjamin Reed added a comment - I don't really understand the issue. everything in git would be nice but does cms work with git?
          Hide
          phunt Patrick Hunt added a comment - Reporter
          Any insights on my previous comment question? Thanks!
          Show
          phunt Patrick Hunt added a comment - Reporter Any insights on my previous comment question? Thanks!
          Hide
          infrabot #asfinfra Bot added a comment -
          Hi,

          This issue has not been updated for at least 3 days, and is being marked as 'Pending Closed'.
            
          In 5 days this issue will be automatically closed if no further updates are received.


          --
          Cheers,
          Apache Infrastructure Team
          Show
          infrabot #asfinfra Bot added a comment - Hi, This issue has not been updated for at least 3 days, and is being marked as 'Pending Closed'.    In 5 days this issue will be automatically closed if no further updates are received. -- Cheers, Apache Infrastructure Team
          Hide
          phunt Patrick Hunt added a comment - Reporter
          bq. Do you want me to pull the current CMS part of the svn repo into it's own repo to seperate it? Or are you still deciding on how to deal with the site?

          Can we just leave it as-is? Are you able to set the tags/trunk/branches directories to r/o? How can we make it so that we can continue to user (commit) to the other directories while not allowing anyone to modify tags/trunk/branches.
          Show
          phunt Patrick Hunt added a comment - Reporter bq. Do you want me to pull the current CMS part of the svn repo into it's own repo to seperate it? Or are you still deciding on how to deal with the site? Can we just leave it as-is? Are you able to set the tags/trunk/branches directories to r/o? How can we make it so that we can continue to user (commit) to the other directories while not allowing anyone to modify tags/trunk/branches.
          Hide
          hanm Michael Han added a comment -
          Thanks Daniel! Verified default branch on https://github.com/apache/zookeeper is now master.
          Show
          hanm Michael Han added a comment - Thanks Daniel! Verified default branch on https://github.com/apache/zookeeper is now master.
          Hide
          pono Daniel Takamori added a comment -
          Fixed the default branch.

          Do you want me to pull the current CMS part of the svn repo into it's own repo to seperate it? Or are you still deciding on how to deal with the site?
          Show
          pono Daniel Takamori added a comment - Fixed the default branch. Do you want me to pull the current CMS part of the svn repo into it's own repo to seperate it? Or are you still deciding on how to deal with the site?
          Hide
          hanm Michael Han added a comment - - edited
          The default branch of https://github.com/apache/zookeeper is now set as branch ZOOKEEPER-823. From the discussion here it looks like the default branch should be set as 'master':

          <quote> I will change the default branch to 'master' unless you have another preference. </quote>

          Which makes more sense than current default branch 'ZOOKEEPER-823' and is consistent with old behavior (where default branch was set to trunk before svn - git migration.). This should be fixed I think.
          Show
          hanm Michael Han added a comment - - edited The default branch of https://github.com/apache/zookeeper is now set as branch ZOOKEEPER-823 . From the discussion here it looks like the default branch should be set as 'master': <quote> I will change the default branch to 'master' unless you have another preference. </quote> Which makes more sense than current default branch ' ZOOKEEPER-823 ' and is consistent with old behavior (where default branch was set to trunk before svn - git migration.). This should be fixed I think.
          Hide
          pono Daniel Takamori added a comment -
          The CMS does not work with git. I could seperate out the site into it's own SVN repo if that's something that's desired.
          Show
          pono Daniel Takamori added a comment - The CMS does not work with git. I could seperate out the site into it's own SVN repo if that's something that's desired.
          Hide
          breed Benjamin Reed added a comment -
          agreed, but i don't have a big preference. i just want to make sure which one to use to update the zookeeper site.
          Show
          breed Benjamin Reed added a comment - agreed, but i don't have a big preference. i just want to make sure which one to use to update the zookeeper site.
          Hide
          phunt Patrick Hunt added a comment - - edited Reporter
          Hm, that's a good question

          https://svn.apache.org/repos/asf/zookeeper/

          contains
          ----
          branches/
          dist/
          legacy-site/
          logo/
          site/
          tags/
          trunk/
          ----

          Looks like trunk/tags/branches came across to git. However site/logo/legacy-site/dist did not.

          [~breed], I believe those should come across (can we create branches within the zookeeper.git repository?) as well, any thoughts/concerns?

          For example, I'm not sure if Apache CMS works on git? Our web site "site" is published through CMS.
          Show
          phunt Patrick Hunt added a comment - - edited Reporter Hm, that's a good question https://svn.apache.org/repos/asf/zookeeper/ contains ---- branches/ dist/ legacy-site/ logo/ site/ tags/ trunk/ ---- Looks like trunk/tags/branches came across to git. However site/logo/legacy-site/dist did not. [~breed], I believe those should come across (can we create branches within the zookeeper.git repository?) as well, any thoughts/concerns? For example, I'm not sure if Apache CMS works on git? Our web site "site" is published through CMS.
          Hide
          breed Benjamin Reed added a comment -
          is the project website still managed by svn?
          Show
          breed Benjamin Reed added a comment - is the project website still managed by svn?
          Hide
          phunt Patrick Hunt added a comment - Reporter
          Thanks Daniel!
          Show
          phunt Patrick Hunt added a comment - Reporter Thanks Daniel!
          Hide
          pono Daniel Takamori added a comment -
          https://git-wip-us.apache.org/repos/asf?p=zookeeper.git

          You are all setup to start committing with git! The GitHub mirror will refresh within a day and then I will change the default branch to 'master' unless you have another preference.
          Show
          pono Daniel Takamori added a comment - https://git-wip-us.apache.org/repos/asf?p=zookeeper.git You are all setup to start committing with git! The GitHub mirror will refresh within a day and then I will change the default branch to 'master' unless you have another preference.
          Hide
          breed Benjamin Reed added a comment -
          the migration has begun correct? will you update here when we can start committing again?
          Show
          breed Benjamin Reed added a comment - the migration has begun correct? will you update here when we can start committing again?
          Hide
          phunt Patrick Hunt added a comment - Reporter
          Thank you [~pono]. One question, given we already have an active git mirror inside Apache of our SVN repo (git://git.apache.org/zookeeper.git) why would the repo need to be migrated again? Is it not possible to convert the existing git repo directly? I'm sorry if I'm missing something obvious, just trying to understand the process.
          Show
          phunt Patrick Hunt added a comment - Reporter Thank you [~pono]. One question, given we already have an active git mirror inside Apache of our SVN repo ( git://git.apache.org/zookeeper.git ) why would the repo need to be migrated again? Is it not possible to convert the existing git repo directly? I'm sorry if I'm missing something obvious, just trying to understand the process.
          Hide
          pono Daniel Takamori added a comment -
          I've been informed by other members of the Infra team that it's possible it takes upwards of 24 hours. So propose a time when that works and we can schedule something.
          Show
          pono Daniel Takamori added a comment - I've been informed by other members of the Infra team that it's possible it takes upwards of 24 hours. So propose a time when that works and we can schedule something.
          Hide
          pono Daniel Takamori added a comment -
          The migration length is dependent on the repo size, so it might take around 3 hours to be on the safe side.
          How does Saturday around 18:00 UTC sound?
          Show
          pono Daniel Takamori added a comment - The migration length is dependent on the repo size, so it might take around 3 hours to be on the safe side. How does Saturday around 18:00 UTC sound?
          Hide
          phunt Patrick Hunt added a comment - Reporter
          Sounds good. Thanks [~humbedooh]. How long will the migration take (hrs est)? Can we set a day/time in the near future? Earliest later this week, when you all have time of course. I will communicate the details out to the ZK community and coordinate.
          Show
          phunt Patrick Hunt added a comment - Reporter Sounds good. Thanks [~humbedooh]. How long will the migration take (hrs est)? Can we set a day/time in the near future? Earliest later this week, when you all have time of course. I will communicate the details out to the ZK community and coordinate.
          Hide
          humbedooh Daniel Gruno added a comment -
          Yes, we can move you to git, provided you don't commit any code during migration. The default mailing list targets would apply here, of course.
          Show
          humbedooh Daniel Gruno added a comment - Yes, we can move you to git, provided you don't commit any code during migration. The default mailing list targets would apply here, of course.

            People

            • Assignee:
              pono Daniel Takamori
              Reporter:
              phunt Patrick Hunt
              Request participants:
              None
            • Votes:
              1 Vote for this issue
              Watchers:
              7 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: