[COMMITTER] repo locked due to synchronization issues

[bowen.li]

Hi committers,

Recently I've run a repo issue multiple times in different days. When I
tried to push a commit to master, git reports the following error:

```
remote: This repository has been locked due to synchronization issues:
remote:  - /x1/gitbox/broken/flink.txt exists due to a previous error, and
prevents pushes.
remote: This could either be a benign issue, or the repositories could be
out of sync.
remote: Please contact [hidden email] to have infrastructure
resolve the issue.
remote:
To https://gitbox.apache.org/repos/asf/flink.git
 ! [remote rejected]       master -> master (pre-receive hook declined)
error: failed to push some refs to '
https://gitbox.apache.org/repos/asf/flink.git'
```

This is quite a new issue that didn't come till two or three weeks ago. I
researched online with no luck. I also reported it to ASF INFRA [1] but
their suggested solution doesn't work.

The issue however usually goes away the next morning in PST, so I assume
someone from a different timezone in Asia or Europe fixes it somehow? Has
anyone run into it before? How did you fix it?

Thanks,
Bowen

[1] https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992

[Jark Wu-2]

Hi Bowen,

I have also encountered this problem. I don't know how to fix this.
But pushing to GitHub repo always works for me.

Best,
Jark

On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]> wrote:

> Hi committers,
>
> Recently I've run a repo issue multiple times in different days. When I
> tried to push a commit to master, git reports the following error:
>
> ```
> remote: This repository has been locked due to synchronization issues:
> remote:  - /x1/gitbox/broken/flink.txt exists due to a previous error, and
> prevents pushes.
> remote: This could either be a benign issue, or the repositories could be
> out of sync.
> remote: Please contact [hidden email] to have infrastructure
> resolve the issue.
> remote:
> To https://gitbox.apache.org/repos/asf/flink.git
>  ! [remote rejected]       master -> master (pre-receive hook declined)
> error: failed to push some refs to '
> https://gitbox.apache.org/repos/asf/flink.git'
> ```
>
> This is quite a new issue that didn't come till two or three weeks ago. I
> researched online with no luck. I also reported it to ASF INFRA [1] but
> their suggested solution doesn't work.
>
> The issue however usually goes away the next morning in PST, so I assume
> someone from a different timezone in Asia or Europe fixes it somehow? Has
> anyone run into it before? How did you fix it?
>
> Thanks,
> Bowen
>
> [1] https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
>

[Till Rohrmann]

Pushing directly to Github also works for me without a problem.

Cheers,
Till

On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]> wrote:

> Hi Bowen,
>
> I have also encountered this problem. I don't know how to fix this.
> But pushing to GitHub repo always works for me.
>
> Best,
> Jark
>
> On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]> wrote:
>
> > Hi committers,
> >
> > Recently I've run a repo issue multiple times in different days. When I
> > tried to push a commit to master, git reports the following error:
> >
> > ```
> > remote: This repository has been locked due to synchronization issues:
> > remote:  - /x1/gitbox/broken/flink.txt exists due to a previous error,
> and
> > prevents pushes.
> > remote: This could either be a benign issue, or the repositories could be
> > out of sync.
> > remote: Please contact [hidden email] to have infrastructure
> > resolve the issue.
> > remote:
> > To https://gitbox.apache.org/repos/asf/flink.git
> >  ! [remote rejected]       master -> master (pre-receive hook declined)
> > error: failed to push some refs to '
> > https://gitbox.apache.org/repos/asf/flink.git'
> > ```
> >
> > This is quite a new issue that didn't come till two or three weeks ago. I
> > researched online with no luck. I also reported it to ASF INFRA [1] but
> > their suggested solution doesn't work.
> >
> > The issue however usually goes away the next morning in PST, so I assume
> > someone from a different timezone in Asia or Europe fixes it somehow? Has
> > anyone run into it before? How did you fix it?
> >
> > Thanks,
> > Bowen
> >
> > [1] https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> >
>

[Fabian Hueske-2]

Maybe it's a mix of pushing to the ASF repository and Github mirrors?
I'm only pushing to the ASF repositories (although not that frequently
anymore...).

Cheers, Fabian

Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
[hidden email]>:

> Pushing directly to Github also works for me without a problem.
>
> Cheers,
> Till
>
> On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]> wrote:
>
> > Hi Bowen,
> >
> > I have also encountered this problem. I don't know how to fix this.
> > But pushing to GitHub repo always works for me.
> >
> > Best,
> > Jark
> >
> > On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]> wrote:
> >
> > > Hi committers,
> > >
> > > Recently I've run a repo issue multiple times in different days. When I
> > > tried to push a commit to master, git reports the following error:
> > >
> > > ```
> > > remote: This repository has been locked due to synchronization issues:
> > > remote:  - /x1/gitbox/broken/flink.txt exists due to a previous error,
> > and
> > > prevents pushes.
> > > remote: This could either be a benign issue, or the repositories could
> be
> > > out of sync.
> > > remote: Please contact [hidden email] to have infrastructure
> > > resolve the issue.
> > > remote:
> > > To https://gitbox.apache.org/repos/asf/flink.git
> > >  ! [remote rejected]       master -> master (pre-receive hook declined)
> > > error: failed to push some refs to '
> > > https://gitbox.apache.org/repos/asf/flink.git'
> > > ```
> > >
> > > This is quite a new issue that didn't come till two or three weeks
> ago. I
> > > researched online with no luck. I also reported it to ASF INFRA [1] but
> > > their suggested solution doesn't work.
> > >
> > > The issue however usually goes away the next morning in PST, so I
> assume
> > > someone from a different timezone in Asia or Europe fixes it somehow?
> Has
> > > anyone run into it before? How did you fix it?
> > >
> > > Thanks,
> > > Bowen
> > >
> > > [1] https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > >
> >
>

[Hequn Cheng]

I met the same problem. Pushing to the GitHub repo directly works fine and
it seems will resync the two repos.

Best, Hequn

On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <[hidden email]> wrote:

> Maybe it's a mix of pushing to the ASF repository and Github mirrors?
> I'm only pushing to the ASF repositories (although not that frequently
> anymore...).
>
> Cheers, Fabian
>
> Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> [hidden email]>:
>
> > Pushing directly to Github also works for me without a problem.
> >
> > Cheers,
> > Till
> >
> > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]> wrote:
> >
> > > Hi Bowen,
> > >
> > > I have also encountered this problem. I don't know how to fix this.
> > > But pushing to GitHub repo always works for me.
> > >
> > > Best,
> > > Jark
> > >
> > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]> wrote:
> > >
> > > > Hi committers,
> > > >
> > > > Recently I've run a repo issue multiple times in different days.
> When I
> > > > tried to push a commit to master, git reports the following error:
> > > >
> > > > ```
> > > > remote: This repository has been locked due to synchronization
> issues:
> > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a previous
> error,
> > > and
> > > > prevents pushes.
> > > > remote: This could either be a benign issue, or the repositories
> could
> > be
> > > > out of sync.
> > > > remote: Please contact [hidden email] to have infrastructure
> > > > resolve the issue.
> > > > remote:
> > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > >  ! [remote rejected]       master -> master (pre-receive hook
> declined)
> > > > error: failed to push some refs to '
> > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > ```
> > > >
> > > > This is quite a new issue that didn't come till two or three weeks
> > ago. I
> > > > researched online with no luck. I also reported it to ASF INFRA [1]
> but
> > > > their suggested solution doesn't work.
> > > >
> > > > The issue however usually goes away the next morning in PST, so I
> > assume
> > > > someone from a different timezone in Asia or Europe fixes it somehow?
> > Has
> > > > anyone run into it before? How did you fix it?
> > > >
> > > > Thanks,
> > > > Bowen
> > > >
> > > > [1] https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > >
> > >
> >
>

[bowen.li]

Thanks everyone for sharing your practices! The problem seems to be gone as
usual and I am able to push to ASF repo.

Verified by ASF INFRA [1], it's indeed caused by the mixed push problem
that Fabian said. Quote from INFRA, "This issue can sometimes occur when
people commit conflicting branches at the same time on gitbox vs github, so
we recommend that projects stick with one or the other for commits."

Though I'm alright with pushing to Github, can we have a single, standard
way of pushing commits to ASF repo. Right now we don't seem to have such a
standard way according to wiki [2]. The standardization helps to not only
avoid the issue mentioned above, but also eradicate problems where, IIRC,
some committers used to forgot reformat commit messages or squash PR's
commits when merging PRs from Github UI.

That's saying, I wonder if we can get consensus on pushing commits only to
ASF gitbox repo and disable committers' write access to the Github mirror?

[1] https://issues.apache.org/jira/browse/INFRA-18992
[2] https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests

On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <[hidden email]> wrote:

> I met the same problem. Pushing to the GitHub repo directly works fine and
> it seems will resync the two repos.
>
> Best, Hequn
>
> On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <[hidden email]> wrote:
>
> > Maybe it's a mix of pushing to the ASF repository and Github mirrors?
> > I'm only pushing to the ASF repositories (although not that frequently
> > anymore...).
> >
> > Cheers, Fabian
> >
> > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > [hidden email]>:
> >
> > > Pushing directly to Github also works for me without a problem.
> > >
> > > Cheers,
> > > Till
> > >
> > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]> wrote:
> > >
> > > > Hi Bowen,
> > > >
> > > > I have also encountered this problem. I don't know how to fix this.
> > > > But pushing to GitHub repo always works for me.
> > > >
> > > > Best,
> > > > Jark
> > > >
> > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]> wrote:
> > > >
> > > > > Hi committers,
> > > > >
> > > > > Recently I've run a repo issue multiple times in different days.
> > When I
> > > > > tried to push a commit to master, git reports the following error:
> > > > >
> > > > > ```
> > > > > remote: This repository has been locked due to synchronization
> > issues:
> > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a previous
> > error,
> > > > and
> > > > > prevents pushes.
> > > > > remote: This could either be a benign issue, or the repositories
> > could
> > > be
> > > > > out of sync.
> > > > > remote: Please contact [hidden email] to have
> infrastructure
> > > > > resolve the issue.
> > > > > remote:
> > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > >  ! [remote rejected]       master -> master (pre-receive hook
> > declined)
> > > > > error: failed to push some refs to '
> > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > ```
> > > > >
> > > > > This is quite a new issue that didn't come till two or three weeks
> > > ago. I
> > > > > researched online with no luck. I also reported it to ASF INFRA [1]
> > but
> > > > > their suggested solution doesn't work.
> > > > >
> > > > > The issue however usually goes away the next morning in PST, so I
> > > assume
> > > > > someone from a different timezone in Asia or Europe fixes it
> somehow?
> > > Has
> > > > > anyone run into it before? How did you fix it?
> > > > >
> > > > > Thanks,
> > > > > Bowen
> > > > >
> > > > > [1]
> https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > >
> > > >
> > >
> >
>

[Till Rohrmann]

I think it makes sense to state a recommendation in the wiki.

If we decide on something I would be in favour of pushing to Github because
settings credentials up (private keys and signing keys) can happen in one
place. Moreover, one can reuse these credentials to push to contributors PR
branches which is super helpful. Hence there is no need to interact with
two different systems (Gitbox and Github).

Cheers,
Till

On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]> wrote:

> Thanks everyone for sharing your practices! The problem seems to be gone as
> usual and I am able to push to ASF repo.
>
> Verified by ASF INFRA [1], it's indeed caused by the mixed push problem
> that Fabian said. Quote from INFRA, "This issue can sometimes occur when
> people commit conflicting branches at the same time on gitbox vs github, so
> we recommend that projects stick with one or the other for commits."
>
> Though I'm alright with pushing to Github, can we have a single, standard
> way of pushing commits to ASF repo. Right now we don't seem to have such a
> standard way according to wiki [2]. The standardization helps to not only
> avoid the issue mentioned above, but also eradicate problems where, IIRC,
> some committers used to forgot reformat commit messages or squash PR's
> commits when merging PRs from Github UI.
>
> That's saying, I wonder if we can get consensus on pushing commits only to
> ASF gitbox repo and disable committers' write access to the Github mirror?
>
> [1] https://issues.apache.org/jira/browse/INFRA-18992
> [2]
> https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
>
> On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <[hidden email]> wrote:
>
> > I met the same problem. Pushing to the GitHub repo directly works fine
> and
> > it seems will resync the two repos.
> >
> > Best, Hequn
> >
> > On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <[hidden email]> wrote:
> >
> > > Maybe it's a mix of pushing to the ASF repository and Github mirrors?
> > > I'm only pushing to the ASF repositories (although not that frequently
> > > anymore...).
> > >
> > > Cheers, Fabian
> > >
> > > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > > [hidden email]>:
> > >
> > > > Pushing directly to Github also works for me without a problem.
> > > >
> > > > Cheers,
> > > > Till
> > > >
> > > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]> wrote:
> > > >
> > > > > Hi Bowen,
> > > > >
> > > > > I have also encountered this problem. I don't know how to fix this.
> > > > > But pushing to GitHub repo always works for me.
> > > > >
> > > > > Best,
> > > > > Jark
> > > > >
> > > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]>
> wrote:
> > > > >
> > > > > > Hi committers,
> > > > > >
> > > > > > Recently I've run a repo issue multiple times in different days.
> > > When I
> > > > > > tried to push a commit to master, git reports the following
> error:
> > > > > >
> > > > > > ```
> > > > > > remote: This repository has been locked due to synchronization
> > > issues:
> > > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a previous
> > > error,
> > > > > and
> > > > > > prevents pushes.
> > > > > > remote: This could either be a benign issue, or the repositories
> > > could
> > > > be
> > > > > > out of sync.
> > > > > > remote: Please contact [hidden email] to have
> > infrastructure
> > > > > > resolve the issue.
> > > > > > remote:
> > > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > > >  ! [remote rejected]       master -> master (pre-receive hook
> > > declined)
> > > > > > error: failed to push some refs to '
> > > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > > ```
> > > > > >
> > > > > > This is quite a new issue that didn't come till two or three
> weeks
> > > > ago. I
> > > > > > researched online with no luck. I also reported it to ASF INFRA
> [1]
> > > but
> > > > > > their suggested solution doesn't work.
> > > > > >
> > > > > > The issue however usually goes away the next morning in PST, so I
> > > > assume
> > > > > > someone from a different timezone in Asia or Europe fixes it
> > somehow?
> > > > Has
> > > > > > anyone run into it before? How did you fix it?
> > > > > >
> > > > > > Thanks,
> > > > > > Bowen
> > > > > >
> > > > > > [1]
> > https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > > >
> > > > >
> > > >
> > >
> >
>

[Jark Wu-2]

+1 to sticking with Github repo.
I have encountered once that pushing to ASF repo is blocked in China, but
GitHub always works for me and has better performance.
And this keeps the awesome green button for merging PRs from GitHub UI.

Best,
Jark

On Wed, 25 Sep 2019 at 15:57, Till Rohrmann <[hidden email]> wrote:

> I think it makes sense to state a recommendation in the wiki.
>
> If we decide on something I would be in favour of pushing to Github because
> settings credentials up (private keys and signing keys) can happen in one
> place. Moreover, one can reuse these credentials to push to contributors PR
> branches which is super helpful. Hence there is no need to interact with
> two different systems (Gitbox and Github).
>
> Cheers,
> Till
>
> On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]> wrote:
>
> > Thanks everyone for sharing your practices! The problem seems to be gone
> as
> > usual and I am able to push to ASF repo.
> >
> > Verified by ASF INFRA [1], it's indeed caused by the mixed push problem
> > that Fabian said. Quote from INFRA, "This issue can sometimes occur when
> > people commit conflicting branches at the same time on gitbox vs github,
> so
> > we recommend that projects stick with one or the other for commits."
> >
> > Though I'm alright with pushing to Github, can we have a single, standard
> > way of pushing commits to ASF repo. Right now we don't seem to have such
> a
> > standard way according to wiki [2]. The standardization helps to not only
> > avoid the issue mentioned above, but also eradicate problems where, IIRC,
> > some committers used to forgot reformat commit messages or squash PR's
> > commits when merging PRs from Github UI.
> >
> > That's saying, I wonder if we can get consensus on pushing commits only
> to
> > ASF gitbox repo and disable committers' write access to the Github
> mirror?
> >
> > [1] https://issues.apache.org/jira/browse/INFRA-18992
> > [2]
> > https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
> >
> > On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <[hidden email]>
> wrote:
> >
> > > I met the same problem. Pushing to the GitHub repo directly works fine
> > and
> > > it seems will resync the two repos.
> > >
> > > Best, Hequn
> > >
> > > On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <[hidden email]>
> wrote:
> > >
> > > > Maybe it's a mix of pushing to the ASF repository and Github mirrors?
> > > > I'm only pushing to the ASF repositories (although not that
> frequently
> > > > anymore...).
> > > >
> > > > Cheers, Fabian
> > > >
> > > > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > > > [hidden email]>:
> > > >
> > > > > Pushing directly to Github also works for me without a problem.
> > > > >
> > > > > Cheers,
> > > > > Till
> > > > >
> > > > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]> wrote:
> > > > >
> > > > > > Hi Bowen,
> > > > > >
> > > > > > I have also encountered this problem. I don't know how to fix
> this.
> > > > > > But pushing to GitHub repo always works for me.
> > > > > >
> > > > > > Best,
> > > > > > Jark
> > > > > >
> > > > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]>
> > wrote:
> > > > > >
> > > > > > > Hi committers,
> > > > > > >
> > > > > > > Recently I've run a repo issue multiple times in different
> days.
> > > > When I
> > > > > > > tried to push a commit to master, git reports the following
> > error:
> > > > > > >
> > > > > > > ```
> > > > > > > remote: This repository has been locked due to synchronization
> > > > issues:
> > > > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a previous
> > > > error,
> > > > > > and
> > > > > > > prevents pushes.
> > > > > > > remote: This could either be a benign issue, or the
> repositories
> > > > could
> > > > > be
> > > > > > > out of sync.
> > > > > > > remote: Please contact [hidden email] to have
> > > infrastructure
> > > > > > > resolve the issue.
> > > > > > > remote:
> > > > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > > > >  ! [remote rejected]       master -> master (pre-receive hook
> > > > declined)
> > > > > > > error: failed to push some refs to '
> > > > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > > > ```
> > > > > > >
> > > > > > > This is quite a new issue that didn't come till two or three
> > weeks
> > > > > ago. I
> > > > > > > researched online with no luck. I also reported it to ASF INFRA
> > [1]
> > > > but
> > > > > > > their suggested solution doesn't work.
> > > > > > >
> > > > > > > The issue however usually goes away the next morning in PST,
> so I
> > > > > assume
> > > > > > > someone from a different timezone in Asia or Europe fixes it
> > > somehow?
> > > > > Has
> > > > > > > anyone run into it before? How did you fix it?
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Bowen
> > > > > > >
> > > > > > > [1]
> > > https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
>

[Rong Rong]

+1 on to state with one recommendation method in the wiki.
I haven't encountered this often, so I do not have a preference regarding
which way to go (Gitbox or Github). However, I've experienced some
different issues on both Github and Gitbox when setting up new committer
credentials.

If possible, I would like to volunteer to help updating the wiki page with
recommendations once we decided which way to go, along with some useful
resources I found from other ASF project wikis.

Thanks,
Rong


On Wed, Sep 25, 2019 at 4:41 AM Jark Wu <[hidden email]> wrote:

> +1 to sticking with Github repo.
> I have encountered once that pushing to ASF repo is blocked in China, but
> GitHub always works for me and has better performance.
> And this keeps the awesome green button for merging PRs from GitHub UI.
>
> Best,
> Jark
>
> On Wed, 25 Sep 2019 at 15:57, Till Rohrmann <[hidden email]> wrote:
>
> > I think it makes sense to state a recommendation in the wiki.
> >
> > If we decide on something I would be in favour of pushing to Github
> because
> > settings credentials up (private keys and signing keys) can happen in one
> > place. Moreover, one can reuse these credentials to push to contributors
> PR
> > branches which is super helpful. Hence there is no need to interact with
> > two different systems (Gitbox and Github).
> >
> > Cheers,
> > Till
> >
> > On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]> wrote:
> >
> > > Thanks everyone for sharing your practices! The problem seems to be
> gone
> > as
> > > usual and I am able to push to ASF repo.
> > >
> > > Verified by ASF INFRA [1], it's indeed caused by the mixed push problem
> > > that Fabian said. Quote from INFRA, "This issue can sometimes occur
> when
> > > people commit conflicting branches at the same time on gitbox vs
> github,
> > so
> > > we recommend that projects stick with one or the other for commits."
> > >
> > > Though I'm alright with pushing to Github, can we have a single,
> standard
> > > way of pushing commits to ASF repo. Right now we don't seem to have
> such
> > a
> > > standard way according to wiki [2]. The standardization helps to not
> only
> > > avoid the issue mentioned above, but also eradicate problems where,
> IIRC,
> > > some committers used to forgot reformat commit messages or squash PR's
> > > commits when merging PRs from Github UI.
> > >
> > > That's saying, I wonder if we can get consensus on pushing commits only
> > to
> > > ASF gitbox repo and disable committers' write access to the Github
> > mirror?
> > >
> > > [1] https://issues.apache.org/jira/browse/INFRA-18992
> > > [2]
> > >
> https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
> > >
> > > On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <[hidden email]>
> > wrote:
> > >
> > > > I met the same problem. Pushing to the GitHub repo directly works
> fine
> > > and
> > > > it seems will resync the two repos.
> > > >
> > > > Best, Hequn
> > > >
> > > > On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <[hidden email]>
> > wrote:
> > > >
> > > > > Maybe it's a mix of pushing to the ASF repository and Github
> mirrors?
> > > > > I'm only pushing to the ASF repositories (although not that
> > frequently
> > > > > anymore...).
> > > > >
> > > > > Cheers, Fabian
> > > > >
> > > > > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > > > > [hidden email]>:
> > > > >
> > > > > > Pushing directly to Github also works for me without a problem.
> > > > > >
> > > > > > Cheers,
> > > > > > Till
> > > > > >
> > > > > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]>
> wrote:
> > > > > >
> > > > > > > Hi Bowen,
> > > > > > >
> > > > > > > I have also encountered this problem. I don't know how to fix
> > this.
> > > > > > > But pushing to GitHub repo always works for me.
> > > > > > >
> > > > > > > Best,
> > > > > > > Jark
> > > > > > >
> > > > > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]>
> > > wrote:
> > > > > > >
> > > > > > > > Hi committers,
> > > > > > > >
> > > > > > > > Recently I've run a repo issue multiple times in different
> > days.
> > > > > When I
> > > > > > > > tried to push a commit to master, git reports the following
> > > error:
> > > > > > > >
> > > > > > > > ```
> > > > > > > > remote: This repository has been locked due to
> synchronization
> > > > > issues:
> > > > > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a
> previous
> > > > > error,
> > > > > > > and
> > > > > > > > prevents pushes.
> > > > > > > > remote: This could either be a benign issue, or the
> > repositories
> > > > > could
> > > > > > be
> > > > > > > > out of sync.
> > > > > > > > remote: Please contact [hidden email] to have
> > > > infrastructure
> > > > > > > > resolve the issue.
> > > > > > > > remote:
> > > > > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > > > > >  ! [remote rejected]       master -> master (pre-receive hook
> > > > > declined)
> > > > > > > > error: failed to push some refs to '
> > > > > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > > > > ```
> > > > > > > >
> > > > > > > > This is quite a new issue that didn't come till two or three
> > > weeks
> > > > > > ago. I
> > > > > > > > researched online with no luck. I also reported it to ASF
> INFRA
> > > [1]
> > > > > but
> > > > > > > > their suggested solution doesn't work.
> > > > > > > >
> > > > > > > > The issue however usually goes away the next morning in PST,
> > so I
> > > > > > assume
> > > > > > > > someone from a different timezone in Asia or Europe fixes it
> > > > somehow?
> > > > > > Has
> > > > > > > > anyone run into it before? How did you fix it?
> > > > > > > >
> > > > > > > > Thanks,
> > > > > > > > Bowen
> > > > > > > >
> > > > > > > > [1]
> > > > https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
>

[Thomas Weise]

+1 for recommendation to use the github repo

Thanks,
Thomas

On Fri, Sep 27, 2019 at 9:29 AM Rong Rong <[hidden email]> wrote:

> +1 on to state with one recommendation method in the wiki.
> I haven't encountered this often, so I do not have a preference regarding
> which way to go (Gitbox or Github). However, I've experienced some
> different issues on both Github and Gitbox when setting up new committer
> credentials.
>
> If possible, I would like to volunteer to help updating the wiki page with
> recommendations once we decided which way to go, along with some useful
> resources I found from other ASF project wikis.
>
> Thanks,
> Rong
>
>
> On Wed, Sep 25, 2019 at 4:41 AM Jark Wu <[hidden email]> wrote:
>
> > +1 to sticking with Github repo.
> > I have encountered once that pushing to ASF repo is blocked in China, but
> > GitHub always works for me and has better performance.
> > And this keeps the awesome green button for merging PRs from GitHub UI.
> >
> > Best,
> > Jark
> >
> > On Wed, 25 Sep 2019 at 15:57, Till Rohrmann <[hidden email]>
> wrote:
> >
> > > I think it makes sense to state a recommendation in the wiki.
> > >
> > > If we decide on something I would be in favour of pushing to Github
> > because
> > > settings credentials up (private keys and signing keys) can happen in
> one
> > > place. Moreover, one can reuse these credentials to push to
> contributors
> > PR
> > > branches which is super helpful. Hence there is no need to interact
> with
> > > two different systems (Gitbox and Github).
> > >
> > > Cheers,
> > > Till
> > >
> > > On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]> wrote:
> > >
> > > > Thanks everyone for sharing your practices! The problem seems to be
> > gone
> > > as
> > > > usual and I am able to push to ASF repo.
> > > >
> > > > Verified by ASF INFRA [1], it's indeed caused by the mixed push
> problem
> > > > that Fabian said. Quote from INFRA, "This issue can sometimes occur
> > when
> > > > people commit conflicting branches at the same time on gitbox vs
> > github,
> > > so
> > > > we recommend that projects stick with one or the other for commits."
> > > >
> > > > Though I'm alright with pushing to Github, can we have a single,
> > standard
> > > > way of pushing commits to ASF repo. Right now we don't seem to have
> > such
> > > a
> > > > standard way according to wiki [2]. The standardization helps to not
> > only
> > > > avoid the issue mentioned above, but also eradicate problems where,
> > IIRC,
> > > > some committers used to forgot reformat commit messages or squash
> PR's
> > > > commits when merging PRs from Github UI.
> > > >
> > > > That's saying, I wonder if we can get consensus on pushing commits
> only
> > > to
> > > > ASF gitbox repo and disable committers' write access to the Github
> > > mirror?
> > > >
> > > > [1] https://issues.apache.org/jira/browse/INFRA-18992
> > > > [2]
> > > >
> > https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
> > > >
> > > > On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <[hidden email]>
> > > wrote:
> > > >
> > > > > I met the same problem. Pushing to the GitHub repo directly works
> > fine
> > > > and
> > > > > it seems will resync the two repos.
> > > > >
> > > > > Best, Hequn
> > > > >
> > > > > On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <[hidden email]>
> > > wrote:
> > > > >
> > > > > > Maybe it's a mix of pushing to the ASF repository and Github
> > mirrors?
> > > > > > I'm only pushing to the ASF repositories (although not that
> > > frequently
> > > > > > anymore...).
> > > > > >
> > > > > > Cheers, Fabian
> > > > > >
> > > > > > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > > > > > [hidden email]>:
> > > > > >
> > > > > > > Pushing directly to Github also works for me without a problem.
> > > > > > >
> > > > > > > Cheers,
> > > > > > > Till
> > > > > > >
> > > > > > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]>
> > wrote:
> > > > > > >
> > > > > > > > Hi Bowen,
> > > > > > > >
> > > > > > > > I have also encountered this problem. I don't know how to fix
> > > this.
> > > > > > > > But pushing to GitHub repo always works for me.
> > > > > > > >
> > > > > > > > Best,
> > > > > > > > Jark
> > > > > > > >
> > > > > > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <[hidden email]>
> > > > wrote:
> > > > > > > >
> > > > > > > > > Hi committers,
> > > > > > > > >
> > > > > > > > > Recently I've run a repo issue multiple times in different
> > > days.
> > > > > > When I
> > > > > > > > > tried to push a commit to master, git reports the following
> > > > error:
> > > > > > > > >
> > > > > > > > > ```
> > > > > > > > > remote: This repository has been locked due to
> > synchronization
> > > > > > issues:
> > > > > > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a
> > previous
> > > > > > error,
> > > > > > > > and
> > > > > > > > > prevents pushes.
> > > > > > > > > remote: This could either be a benign issue, or the
> > > repositories
> > > > > > could
> > > > > > > be
> > > > > > > > > out of sync.
> > > > > > > > > remote: Please contact [hidden email] to have
> > > > > infrastructure
> > > > > > > > > resolve the issue.
> > > > > > > > > remote:
> > > > > > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > > > > > >  ! [remote rejected]       master -> master (pre-receive
> hook
> > > > > > declined)
> > > > > > > > > error: failed to push some refs to '
> > > > > > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > > > > > ```
> > > > > > > > >
> > > > > > > > > This is quite a new issue that didn't come till two or
> three
> > > > weeks
> > > > > > > ago. I
> > > > > > > > > researched online with no luck. I also reported it to ASF
> > INFRA
> > > > [1]
> > > > > > but
> > > > > > > > > their suggested solution doesn't work.
> > > > > > > > >
> > > > > > > > > The issue however usually goes away the next morning in
> PST,
> > > so I
> > > > > > > assume
> > > > > > > > > someone from a different timezone in Asia or Europe fixes
> it
> > > > > somehow?
> > > > > > > Has
> > > > > > > > > anyone run into it before? How did you fix it?
> > > > > > > > >
> > > > > > > > > Thanks,
> > > > > > > > > Bowen
> > > > > > > > >
> > > > > > > > > [1]
> > > > > https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
>

[Till Rohrmann]

Thanks Rong for volunteering. From my side +1 for using Github repo.

Cheers,
Till

On Fri, Sep 27, 2019 at 9:58 PM Thomas Weise <[hidden email]> wrote:

> +1 for recommendation to use the github repo
>
> Thanks,
> Thomas
>
> On Fri, Sep 27, 2019 at 9:29 AM Rong Rong <[hidden email]> wrote:
>
> > +1 on to state with one recommendation method in the wiki.
> > I haven't encountered this often, so I do not have a preference regarding
> > which way to go (Gitbox or Github). However, I've experienced some
> > different issues on both Github and Gitbox when setting up new committer
> > credentials.
> >
> > If possible, I would like to volunteer to help updating the wiki page
> with
> > recommendations once we decided which way to go, along with some useful
> > resources I found from other ASF project wikis.
> >
> > Thanks,
> > Rong
> >
> >
> > On Wed, Sep 25, 2019 at 4:41 AM Jark Wu <[hidden email]> wrote:
> >
> > > +1 to sticking with Github repo.
> > > I have encountered once that pushing to ASF repo is blocked in China,
> but
> > > GitHub always works for me and has better performance.
> > > And this keeps the awesome green button for merging PRs from GitHub UI.
> > >
> > > Best,
> > > Jark
> > >
> > > On Wed, 25 Sep 2019 at 15:57, Till Rohrmann <[hidden email]>
> > wrote:
> > >
> > > > I think it makes sense to state a recommendation in the wiki.
> > > >
> > > > If we decide on something I would be in favour of pushing to Github
> > > because
> > > > settings credentials up (private keys and signing keys) can happen in
> > one
> > > > place. Moreover, one can reuse these credentials to push to
> > contributors
> > > PR
> > > > branches which is super helpful. Hence there is no need to interact
> > with
> > > > two different systems (Gitbox and Github).
> > > >
> > > > Cheers,
> > > > Till
> > > >
> > > > On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]>
> wrote:
> > > >
> > > > > Thanks everyone for sharing your practices! The problem seems to be
> > > gone
> > > > as
> > > > > usual and I am able to push to ASF repo.
> > > > >
> > > > > Verified by ASF INFRA [1], it's indeed caused by the mixed push
> > problem
> > > > > that Fabian said. Quote from INFRA, "This issue can sometimes occur
> > > when
> > > > > people commit conflicting branches at the same time on gitbox vs
> > > github,
> > > > so
> > > > > we recommend that projects stick with one or the other for
> commits."
> > > > >
> > > > > Though I'm alright with pushing to Github, can we have a single,
> > > standard
> > > > > way of pushing commits to ASF repo. Right now we don't seem to have
> > > such
> > > > a
> > > > > standard way according to wiki [2]. The standardization helps to
> not
> > > only
> > > > > avoid the issue mentioned above, but also eradicate problems where,
> > > IIRC,
> > > > > some committers used to forgot reformat commit messages or squash
> > PR's
> > > > > commits when merging PRs from Github UI.
> > > > >
> > > > > That's saying, I wonder if we can get consensus on pushing commits
> > only
> > > > to
> > > > > ASF gitbox repo and disable committers' write access to the Github
> > > > mirror?
> > > > >
> > > > > [1] https://issues.apache.org/jira/browse/INFRA-18992
> > > > > [2]
> > > > >
> > >
> https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
> > > > >
> > > > > On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <[hidden email]>
> > > > wrote:
> > > > >
> > > > > > I met the same problem. Pushing to the GitHub repo directly works
> > > fine
> > > > > and
> > > > > > it seems will resync the two repos.
> > > > > >
> > > > > > Best, Hequn
> > > > > >
> > > > > > On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <[hidden email]
> >
> > > > wrote:
> > > > > >
> > > > > > > Maybe it's a mix of pushing to the ASF repository and Github
> > > mirrors?
> > > > > > > I'm only pushing to the ASF repositories (although not that
> > > > frequently
> > > > > > > anymore...).
> > > > > > >
> > > > > > > Cheers, Fabian
> > > > > > >
> > > > > > > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > > > > > > [hidden email]>:
> > > > > > >
> > > > > > > > Pushing directly to Github also works for me without a
> problem.
> > > > > > > >
> > > > > > > > Cheers,
> > > > > > > > Till
> > > > > > > >
> > > > > > > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]>
> > > wrote:
> > > > > > > >
> > > > > > > > > Hi Bowen,
> > > > > > > > >
> > > > > > > > > I have also encountered this problem. I don't know how to
> fix
> > > > this.
> > > > > > > > > But pushing to GitHub repo always works for me.
> > > > > > > > >
> > > > > > > > > Best,
> > > > > > > > > Jark
> > > > > > > > >
> > > > > > > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <
> [hidden email]>
> > > > > wrote:
> > > > > > > > >
> > > > > > > > > > Hi committers,
> > > > > > > > > >
> > > > > > > > > > Recently I've run a repo issue multiple times in
> different
> > > > days.
> > > > > > > When I
> > > > > > > > > > tried to push a commit to master, git reports the
> following
> > > > > error:
> > > > > > > > > >
> > > > > > > > > > ```
> > > > > > > > > > remote: This repository has been locked due to
> > > synchronization
> > > > > > > issues:
> > > > > > > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a
> > > previous
> > > > > > > error,
> > > > > > > > > and
> > > > > > > > > > prevents pushes.
> > > > > > > > > > remote: This could either be a benign issue, or the
> > > > repositories
> > > > > > > could
> > > > > > > > be
> > > > > > > > > > out of sync.
> > > > > > > > > > remote: Please contact [hidden email] to have
> > > > > > infrastructure
> > > > > > > > > > resolve the issue.
> > > > > > > > > > remote:
> > > > > > > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > > > > > > >  ! [remote rejected]       master -> master (pre-receive
> > hook
> > > > > > > declined)
> > > > > > > > > > error: failed to push some refs to '
> > > > > > > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > > > > > > ```
> > > > > > > > > >
> > > > > > > > > > This is quite a new issue that didn't come till two or
> > three
> > > > > weeks
> > > > > > > > ago. I
> > > > > > > > > > researched online with no luck. I also reported it to ASF
> > > INFRA
> > > > > [1]
> > > > > > > but
> > > > > > > > > > their suggested solution doesn't work.
> > > > > > > > > >
> > > > > > > > > > The issue however usually goes away the next morning in
> > PST,
> > > > so I
> > > > > > > > assume
> > > > > > > > > > someone from a different timezone in Asia or Europe fixes
> > it
> > > > > > somehow?
> > > > > > > > Has
> > > > > > > > > > anyone run into it before? How did you fix it?
> > > > > > > > > >
> > > > > > > > > > Thanks,
> > > > > > > > > > Bowen
> > > > > > > > > >
> > > > > > > > > > [1]
> > > > > > https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > > > > > > >
> > > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
>

[Rong Rong]

Thanks everyone for the suggestions. I think the majority of us voted for
using Github repo.

I have updated the merging pull request wiki page [1] with the new
instructions.
In addition, I have also added some general information I found useful when
setting up my committer account [2], including how to use Github.

Please kindly take a look. Any comments or suggestions are highly
appreciated!

--
Rong

[1] https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
[2]
https://cwiki.apache.org/confluence/display/FLINK/General+Information+for+Committers#GeneralInformationforCommitters-UsingGithub

On Mon, Sep 30, 2019 at 2:42 AM Till Rohrmann <[hidden email]> wrote:

> Thanks Rong for volunteering. From my side +1 for using Github repo.
>
> Cheers,
> Till
>
> On Fri, Sep 27, 2019 at 9:58 PM Thomas Weise <[hidden email]> wrote:
>
> > +1 for recommendation to use the github repo
> >
> > Thanks,
> > Thomas
> >
> > On Fri, Sep 27, 2019 at 9:29 AM Rong Rong <[hidden email]> wrote:
> >
> > > +1 on to state with one recommendation method in the wiki.
> > > I haven't encountered this often, so I do not have a preference
> regarding
> > > which way to go (Gitbox or Github). However, I've experienced some
> > > different issues on both Github and Gitbox when setting up new
> committer
> > > credentials.
> > >
> > > If possible, I would like to volunteer to help updating the wiki page
> > with
> > > recommendations once we decided which way to go, along with some useful
> > > resources I found from other ASF project wikis.
> > >
> > > Thanks,
> > > Rong
> > >
> > >
> > > On Wed, Sep 25, 2019 at 4:41 AM Jark Wu <[hidden email]> wrote:
> > >
> > > > +1 to sticking with Github repo.
> > > > I have encountered once that pushing to ASF repo is blocked in China,
> > but
> > > > GitHub always works for me and has better performance.
> > > > And this keeps the awesome green button for merging PRs from GitHub
> UI.
> > > >
> > > > Best,
> > > > Jark
> > > >
> > > > On Wed, 25 Sep 2019 at 15:57, Till Rohrmann <[hidden email]>
> > > wrote:
> > > >
> > > > > I think it makes sense to state a recommendation in the wiki.
> > > > >
> > > > > If we decide on something I would be in favour of pushing to Github
> > > > because
> > > > > settings credentials up (private keys and signing keys) can happen
> in
> > > one
> > > > > place. Moreover, one can reuse these credentials to push to
> > > contributors
> > > > PR
> > > > > branches which is super helpful. Hence there is no need to interact
> > > with
> > > > > two different systems (Gitbox and Github).
> > > > >
> > > > > Cheers,
> > > > > Till
> > > > >
> > > > > On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]>
> > wrote:
> > > > >
> > > > > > Thanks everyone for sharing your practices! The problem seems to
> be
> > > > gone
> > > > > as
> > > > > > usual and I am able to push to ASF repo.
> > > > > >
> > > > > > Verified by ASF INFRA [1], it's indeed caused by the mixed push
> > > problem
> > > > > > that Fabian said. Quote from INFRA, "This issue can sometimes
> occur
> > > > when
> > > > > > people commit conflicting branches at the same time on gitbox vs
> > > > github,
> > > > > so
> > > > > > we recommend that projects stick with one or the other for
> > commits."
> > > > > >
> > > > > > Though I'm alright with pushing to Github, can we have a single,
> > > > standard
> > > > > > way of pushing commits to ASF repo. Right now we don't seem to
> have
> > > > such
> > > > > a
> > > > > > standard way according to wiki [2]. The standardization helps to
> > not
> > > > only
> > > > > > avoid the issue mentioned above, but also eradicate problems
> where,
> > > > IIRC,
> > > > > > some committers used to forgot reformat commit messages or squash
> > > PR's
> > > > > > commits when merging PRs from Github UI.
> > > > > >
> > > > > > That's saying, I wonder if we can get consensus on pushing
> commits
> > > only
> > > > > to
> > > > > > ASF gitbox repo and disable committers' write access to the
> Github
> > > > > mirror?
> > > > > >
> > > > > > [1] https://issues.apache.org/jira/browse/INFRA-18992
> > > > > > [2]
> > > > > >
> > > >
> > https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
> > > > > >
> > > > > > On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <
> [hidden email]>
> > > > > wrote:
> > > > > >
> > > > > > > I met the same problem. Pushing to the GitHub repo directly
> works
> > > > fine
> > > > > > and
> > > > > > > it seems will resync the two repos.
> > > > > > >
> > > > > > > Best, Hequn
> > > > > > >
> > > > > > > On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <
> [hidden email]
> > >
> > > > > wrote:
> > > > > > >
> > > > > > > > Maybe it's a mix of pushing to the ASF repository and Github
> > > > mirrors?
> > > > > > > > I'm only pushing to the ASF repositories (although not that
> > > > > frequently
> > > > > > > > anymore...).
> > > > > > > >
> > > > > > > > Cheers, Fabian
> > > > > > > >
> > > > > > > > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > > > > > > > [hidden email]>:
> > > > > > > >
> > > > > > > > > Pushing directly to Github also works for me without a
> > problem.
> > > > > > > > >
> > > > > > > > > Cheers,
> > > > > > > > > Till
> > > > > > > > >
> > > > > > > > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <[hidden email]
> >
> > > > wrote:
> > > > > > > > >
> > > > > > > > > > Hi Bowen,
> > > > > > > > > >
> > > > > > > > > > I have also encountered this problem. I don't know how to
> > fix
> > > > > this.
> > > > > > > > > > But pushing to GitHub repo always works for me.
> > > > > > > > > >
> > > > > > > > > > Best,
> > > > > > > > > > Jark
> > > > > > > > > >
> > > > > > > > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <
> > [hidden email]>
> > > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > > Hi committers,
> > > > > > > > > > >
> > > > > > > > > > > Recently I've run a repo issue multiple times in
> > different
> > > > > days.
> > > > > > > > When I
> > > > > > > > > > > tried to push a commit to master, git reports the
> > following
> > > > > > error:
> > > > > > > > > > >
> > > > > > > > > > > ```
> > > > > > > > > > > remote: This repository has been locked due to
> > > > synchronization
> > > > > > > > issues:
> > > > > > > > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to a
> > > > previous
> > > > > > > > error,
> > > > > > > > > > and
> > > > > > > > > > > prevents pushes.
> > > > > > > > > > > remote: This could either be a benign issue, or the
> > > > > repositories
> > > > > > > > could
> > > > > > > > > be
> > > > > > > > > > > out of sync.
> > > > > > > > > > > remote: Please contact [hidden email] to have
> > > > > > > infrastructure
> > > > > > > > > > > resolve the issue.
> > > > > > > > > > > remote:
> > > > > > > > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > > > > > > > >  ! [remote rejected]       master -> master
> (pre-receive
> > > hook
> > > > > > > > declined)
> > > > > > > > > > > error: failed to push some refs to '
> > > > > > > > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > > > > > > > ```
> > > > > > > > > > >
> > > > > > > > > > > This is quite a new issue that didn't come till two or
> > > three
> > > > > > weeks
> > > > > > > > > ago. I
> > > > > > > > > > > researched online with no luck. I also reported it to
> ASF
> > > > INFRA
> > > > > > [1]
> > > > > > > > but
> > > > > > > > > > > their suggested solution doesn't work.
> > > > > > > > > > >
> > > > > > > > > > > The issue however usually goes away the next morning in
> > > PST,
> > > > > so I
> > > > > > > > > assume
> > > > > > > > > > > someone from a different timezone in Asia or Europe
> fixes
> > > it
> > > > > > > somehow?
> > > > > > > > > Has
> > > > > > > > > > > anyone run into it before? How did you fix it?
> > > > > > > > > > >
> > > > > > > > > > > Thanks,
> > > > > > > > > > > Bowen
> > > > > > > > > > >
> > > > > > > > > > > [1]
> > > > > > >
> https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > > > > > > > >
> > > > > > > > > >
> > > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
>

[Till Rohrmann]

Thanks for updating the wiki pages Rong. Looks good to me.

Cheers,
Till

On Sun, Oct 6, 2019 at 7:21 PM Rong Rong <[hidden email]> wrote:

> Thanks everyone for the suggestions. I think the majority of us voted for
> using Github repo.
>
> I have updated the merging pull request wiki page [1] with the new
> instructions.
> In addition, I have also added some general information I found useful when
> setting up my committer account [2], including how to use Github.
>
> Please kindly take a look. Any comments or suggestions are highly
> appreciated!
>
> --
> Rong
>
> [1]
> https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
> [2]
>
> https://cwiki.apache.org/confluence/display/FLINK/General+Information+for+Committers#GeneralInformationforCommitters-UsingGithub
>
> On Mon, Sep 30, 2019 at 2:42 AM Till Rohrmann <[hidden email]>
> wrote:
>
> > Thanks Rong for volunteering. From my side +1 for using Github repo.
> >
> > Cheers,
> > Till
> >
> > On Fri, Sep 27, 2019 at 9:58 PM Thomas Weise <[hidden email]> wrote:
> >
> > > +1 for recommendation to use the github repo
> > >
> > > Thanks,
> > > Thomas
> > >
> > > On Fri, Sep 27, 2019 at 9:29 AM Rong Rong <[hidden email]> wrote:
> > >
> > > > +1 on to state with one recommendation method in the wiki.
> > > > I haven't encountered this often, so I do not have a preference
> > regarding
> > > > which way to go (Gitbox or Github). However, I've experienced some
> > > > different issues on both Github and Gitbox when setting up new
> > committer
> > > > credentials.
> > > >
> > > > If possible, I would like to volunteer to help updating the wiki page
> > > with
> > > > recommendations once we decided which way to go, along with some
> useful
> > > > resources I found from other ASF project wikis.
> > > >
> > > > Thanks,
> > > > Rong
> > > >
> > > >
> > > > On Wed, Sep 25, 2019 at 4:41 AM Jark Wu <[hidden email]> wrote:
> > > >
> > > > > +1 to sticking with Github repo.
> > > > > I have encountered once that pushing to ASF repo is blocked in
> China,
> > > but
> > > > > GitHub always works for me and has better performance.
> > > > > And this keeps the awesome green button for merging PRs from GitHub
> > UI.
> > > > >
> > > > > Best,
> > > > > Jark
> > > > >
> > > > > On Wed, 25 Sep 2019 at 15:57, Till Rohrmann <[hidden email]>
> > > > wrote:
> > > > >
> > > > > > I think it makes sense to state a recommendation in the wiki.
> > > > > >
> > > > > > If we decide on something I would be in favour of pushing to
> Github
> > > > > because
> > > > > > settings credentials up (private keys and signing keys) can
> happen
> > in
> > > > one
> > > > > > place. Moreover, one can reuse these credentials to push to
> > > > contributors
> > > > > PR
> > > > > > branches which is super helpful. Hence there is no need to
> interact
> > > > with
> > > > > > two different systems (Gitbox and Github).
> > > > > >
> > > > > > Cheers,
> > > > > > Till
> > > > > >
> > > > > > On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]>
> > > wrote:
> > > > > >
> > > > > > > Thanks everyone for sharing your practices! The problem seems
> to
> > be
> > > > > gone
> > > > > > as
> > > > > > > usual and I am able to push to ASF repo.
> > > > > > >
> > > > > > > Verified by ASF INFRA [1], it's indeed caused by the mixed push
> > > > problem
> > > > > > > that Fabian said. Quote from INFRA, "This issue can sometimes
> > occur
> > > > > when
> > > > > > > people commit conflicting branches at the same time on gitbox
> vs
> > > > > github,
> > > > > > so
> > > > > > > we recommend that projects stick with one or the other for
> > > commits."
> > > > > > >
> > > > > > > Though I'm alright with pushing to Github, can we have a
> single,
> > > > > standard
> > > > > > > way of pushing commits to ASF repo. Right now we don't seem to
> > have
> > > > > such
> > > > > > a
> > > > > > > standard way according to wiki [2]. The standardization helps
> to
> > > not
> > > > > only
> > > > > > > avoid the issue mentioned above, but also eradicate problems
> > where,
> > > > > IIRC,
> > > > > > > some committers used to forgot reformat commit messages or
> squash
> > > > PR's
> > > > > > > commits when merging PRs from Github UI.
> > > > > > >
> > > > > > > That's saying, I wonder if we can get consensus on pushing
> > commits
> > > > only
> > > > > > to
> > > > > > > ASF gitbox repo and disable committers' write access to the
> > Github
> > > > > > mirror?
> > > > > > >
> > > > > > > [1] https://issues.apache.org/jira/browse/INFRA-18992
> > > > > > > [2]
> > > > > > >
> > > > >
> > >
> https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
> > > > > > >
> > > > > > > On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <
> > [hidden email]>
> > > > > > wrote:
> > > > > > >
> > > > > > > > I met the same problem. Pushing to the GitHub repo directly
> > works
> > > > > fine
> > > > > > > and
> > > > > > > > it seems will resync the two repos.
> > > > > > > >
> > > > > > > > Best, Hequn
> > > > > > > >
> > > > > > > > On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <
> > [hidden email]
> > > >
> > > > > > wrote:
> > > > > > > >
> > > > > > > > > Maybe it's a mix of pushing to the ASF repository and
> Github
> > > > > mirrors?
> > > > > > > > > I'm only pushing to the ASF repositories (although not that
> > > > > > frequently
> > > > > > > > > anymore...).
> > > > > > > > >
> > > > > > > > > Cheers, Fabian
> > > > > > > > >
> > > > > > > > > Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
> > > > > > > > > [hidden email]>:
> > > > > > > > >
> > > > > > > > > > Pushing directly to Github also works for me without a
> > > problem.
> > > > > > > > > >
> > > > > > > > > > Cheers,
> > > > > > > > > > Till
> > > > > > > > > >
> > > > > > > > > > On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <
> [hidden email]
> > >
> > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > > Hi Bowen,
> > > > > > > > > > >
> > > > > > > > > > > I have also encountered this problem. I don't know how
> to
> > > fix
> > > > > > this.
> > > > > > > > > > > But pushing to GitHub repo always works for me.
> > > > > > > > > > >
> > > > > > > > > > > Best,
> > > > > > > > > > > Jark
> > > > > > > > > > >
> > > > > > > > > > > On Tue, 24 Sep 2019 at 06:05, Bowen Li <
> > > [hidden email]>
> > > > > > > wrote:
> > > > > > > > > > >
> > > > > > > > > > > > Hi committers,
> > > > > > > > > > > >
> > > > > > > > > > > > Recently I've run a repo issue multiple times in
> > > different
> > > > > > days.
> > > > > > > > > When I
> > > > > > > > > > > > tried to push a commit to master, git reports the
> > > following
> > > > > > > error:
> > > > > > > > > > > >
> > > > > > > > > > > > ```
> > > > > > > > > > > > remote: This repository has been locked due to
> > > > > synchronization
> > > > > > > > > issues:
> > > > > > > > > > > > remote:  - /x1/gitbox/broken/flink.txt exists due to
> a
> > > > > previous
> > > > > > > > > error,
> > > > > > > > > > > and
> > > > > > > > > > > > prevents pushes.
> > > > > > > > > > > > remote: This could either be a benign issue, or the
> > > > > > repositories
> > > > > > > > > could
> > > > > > > > > > be
> > > > > > > > > > > > out of sync.
> > > > > > > > > > > > remote: Please contact [hidden email] to
> have
> > > > > > > > infrastructure
> > > > > > > > > > > > resolve the issue.
> > > > > > > > > > > > remote:
> > > > > > > > > > > > To https://gitbox.apache.org/repos/asf/flink.git
> > > > > > > > > > > >  ! [remote rejected]       master -> master
> > (pre-receive
> > > > hook
> > > > > > > > > declined)
> > > > > > > > > > > > error: failed to push some refs to '
> > > > > > > > > > > > https://gitbox.apache.org/repos/asf/flink.git'
> > > > > > > > > > > > ```
> > > > > > > > > > > >
> > > > > > > > > > > > This is quite a new issue that didn't come till two
> or
> > > > three
> > > > > > > weeks
> > > > > > > > > > ago. I
> > > > > > > > > > > > researched online with no luck. I also reported it to
> > ASF
> > > > > INFRA
> > > > > > > [1]
> > > > > > > > > but
> > > > > > > > > > > > their suggested solution doesn't work.
> > > > > > > > > > > >
> > > > > > > > > > > > The issue however usually goes away the next morning
> in
> > > > PST,
> > > > > > so I
> > > > > > > > > > assume
> > > > > > > > > > > > someone from a different timezone in Asia or Europe
> > fixes
> > > > it
> > > > > > > > somehow?
> > > > > > > > > > Has
> > > > > > > > > > > > anyone run into it before? How did you fix it?
> > > > > > > > > > > >
> > > > > > > > > > > > Thanks,
> > > > > > > > > > > > Bowen
> > > > > > > > > > > >
> > > > > > > > > > > > [1]
> > > > > > > >
> > https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
> > > > > > > > > > > >
> > > > > > > > > > >
> > > > > > > > > >
> > > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > >
> > > > >
> > > >
> > >
> >
>

[Jark Wu-2]

Thanks Rong for updating the wiki pages.

Best,
Jark

> 在 2019年10月7日，18:37，Till Rohrmann <[hidden email]> 写道：
>
> Thanks for updating the wiki pages Rong. Looks good to me.
>
> Cheers,
> Till
>
> On Sun, Oct 6, 2019 at 7:21 PM Rong Rong <[hidden email]> wrote:
>
>> Thanks everyone for the suggestions. I think the majority of us voted for
>> using Github repo.
>>
>> I have updated the merging pull request wiki page [1] with the new
>> instructions.
>> In addition, I have also added some general information I found useful when
>> setting up my committer account [2], including how to use Github.
>>
>> Please kindly take a look. Any comments or suggestions are highly
>> appreciated!
>>
>> --
>> Rong
>>
>> [1]
>> https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
>> [2]
>>
>> https://cwiki.apache.org/confluence/display/FLINK/General+Information+for+Committers#GeneralInformationforCommitters-UsingGithub
>>
>> On Mon, Sep 30, 2019 at 2:42 AM Till Rohrmann <[hidden email]>
>> wrote:
>>
>>> Thanks Rong for volunteering. From my side +1 for using Github repo.
>>>
>>> Cheers,
>>> Till
>>>
>>> On Fri, Sep 27, 2019 at 9:58 PM Thomas Weise <[hidden email]> wrote:
>>>
>>>> +1 for recommendation to use the github repo
>>>>
>>>> Thanks,
>>>> Thomas
>>>>
>>>> On Fri, Sep 27, 2019 at 9:29 AM Rong Rong <[hidden email]> wrote:
>>>>
>>>>> +1 on to state with one recommendation method in the wiki.
>>>>> I haven't encountered this often, so I do not have a preference
>>> regarding
>>>>> which way to go (Gitbox or Github). However, I've experienced some
>>>>> different issues on both Github and Gitbox when setting up new
>>> committer
>>>>> credentials.
>>>>>
>>>>> If possible, I would like to volunteer to help updating the wiki page
>>>> with
>>>>> recommendations once we decided which way to go, along with some
>> useful
>>>>> resources I found from other ASF project wikis.
>>>>>
>>>>> Thanks,
>>>>> Rong
>>>>>
>>>>>
>>>>> On Wed, Sep 25, 2019 at 4:41 AM Jark Wu <[hidden email]> wrote:
>>>>>
>>>>>> +1 to sticking with Github repo.
>>>>>> I have encountered once that pushing to ASF repo is blocked in
>> China,
>>>> but
>>>>>> GitHub always works for me and has better performance.
>>>>>> And this keeps the awesome green button for merging PRs from GitHub
>>> UI.
>>>>>>
>>>>>> Best,
>>>>>> Jark
>>>>>>
>>>>>> On Wed, 25 Sep 2019 at 15:57, Till Rohrmann <[hidden email]>
>>>>> wrote:
>>>>>>
>>>>>>> I think it makes sense to state a recommendation in the wiki.
>>>>>>>
>>>>>>> If we decide on something I would be in favour of pushing to
>> Github
>>>>>> because
>>>>>>> settings credentials up (private keys and signing keys) can
>> happen
>>> in
>>>>> one
>>>>>>> place. Moreover, one can reuse these credentials to push to
>>>>> contributors
>>>>>> PR
>>>>>>> branches which is super helpful. Hence there is no need to
>> interact
>>>>> with
>>>>>>> two different systems (Gitbox and Github).
>>>>>>>
>>>>>>> Cheers,
>>>>>>> Till
>>>>>>>
>>>>>>> On Tue, Sep 24, 2019 at 8:03 PM Bowen Li <[hidden email]>
>>>> wrote:
>>>>>>>
>>>>>>>> Thanks everyone for sharing your practices! The problem seems
>> to
>>> be
>>>>>> gone
>>>>>>> as
>>>>>>>> usual and I am able to push to ASF repo.
>>>>>>>>
>>>>>>>> Verified by ASF INFRA [1], it's indeed caused by the mixed push
>>>>> problem
>>>>>>>> that Fabian said. Quote from INFRA, "This issue can sometimes
>>> occur
>>>>>> when
>>>>>>>> people commit conflicting branches at the same time on gitbox
>> vs
>>>>>> github,
>>>>>>> so
>>>>>>>> we recommend that projects stick with one or the other for
>>>> commits."
>>>>>>>>
>>>>>>>> Though I'm alright with pushing to Github, can we have a
>> single,
>>>>>> standard
>>>>>>>> way of pushing commits to ASF repo. Right now we don't seem to
>>> have
>>>>>> such
>>>>>>> a
>>>>>>>> standard way according to wiki [2]. The standardization helps
>> to
>>>> not
>>>>>> only
>>>>>>>> avoid the issue mentioned above, but also eradicate problems
>>> where,
>>>>>> IIRC,
>>>>>>>> some committers used to forgot reformat commit messages or
>> squash
>>>>> PR's
>>>>>>>> commits when merging PRs from Github UI.
>>>>>>>>
>>>>>>>> That's saying, I wonder if we can get consensus on pushing
>>> commits
>>>>> only
>>>>>>> to
>>>>>>>> ASF gitbox repo and disable committers' write access to the
>>> Github
>>>>>>> mirror?
>>>>>>>>
>>>>>>>> [1] https://issues.apache.org/jira/browse/INFRA-18992
>>>>>>>> [2]
>>>>>>>>
>>>>>>
>>>>
>> https://cwiki.apache.org/confluence/display/FLINK/Merging+Pull+Requests
>>>>>>>>
>>>>>>>> On Tue, Sep 24, 2019 at 4:44 AM Hequn Cheng <
>>> [hidden email]>
>>>>>>> wrote:
>>>>>>>>
>>>>>>>>> I met the same problem. Pushing to the GitHub repo directly
>>> works
>>>>>> fine
>>>>>>>> and
>>>>>>>>> it seems will resync the two repos.
>>>>>>>>>
>>>>>>>>> Best, Hequn
>>>>>>>>>
>>>>>>>>> On Tue, Sep 24, 2019 at 4:59 PM Fabian Hueske <
>>> [hidden email]
>>>>>
>>>>>>> wrote:
>>>>>>>>>
>>>>>>>>>> Maybe it's a mix of pushing to the ASF repository and
>> Github
>>>>>> mirrors?
>>>>>>>>>> I'm only pushing to the ASF repositories (although not that
>>>>>>> frequently
>>>>>>>>>> anymore...).
>>>>>>>>>>
>>>>>>>>>> Cheers, Fabian
>>>>>>>>>>
>>>>>>>>>> Am Di., 24. Sept. 2019 um 10:50 Uhr schrieb Till Rohrmann <
>>>>>>>>>> [hidden email]>:
>>>>>>>>>>
>>>>>>>>>>> Pushing directly to Github also works for me without a
>>>> problem.
>>>>>>>>>>>
>>>>>>>>>>> Cheers,
>>>>>>>>>>> Till
>>>>>>>>>>>
>>>>>>>>>>> On Tue, Sep 24, 2019 at 10:28 AM Jark Wu <
>> [hidden email]
>>>>
>>>>>> wrote:
>>>>>>>>>>>
>>>>>>>>>>>> Hi Bowen,
>>>>>>>>>>>>
>>>>>>>>>>>> I have also encountered this problem. I don't know how
>> to
>>>> fix
>>>>>>> this.
>>>>>>>>>>>> But pushing to GitHub repo always works for me.
>>>>>>>>>>>>
>>>>>>>>>>>> Best,
>>>>>>>>>>>> Jark
>>>>>>>>>>>>
>>>>>>>>>>>> On Tue, 24 Sep 2019 at 06:05, Bowen Li <
>>>> [hidden email]>
>>>>>>>> wrote:
>>>>>>>>>>>>
>>>>>>>>>>>>> Hi committers,
>>>>>>>>>>>>>
>>>>>>>>>>>>> Recently I've run a repo issue multiple times in
>>>> different
>>>>>>> days.
>>>>>>>>>> When I
>>>>>>>>>>>>> tried to push a commit to master, git reports the
>>>> following
>>>>>>>> error:
>>>>>>>>>>>>>
>>>>>>>>>>>>> ```
>>>>>>>>>>>>> remote: This repository has been locked due to
>>>>>> synchronization
>>>>>>>>>> issues:
>>>>>>>>>>>>> remote:  - /x1/gitbox/broken/flink.txt exists due to
>> a
>>>>>> previous
>>>>>>>>>> error,
>>>>>>>>>>>> and
>>>>>>>>>>>>> prevents pushes.
>>>>>>>>>>>>> remote: This could either be a benign issue, or the
>>>>>>> repositories
>>>>>>>>>> could
>>>>>>>>>>> be
>>>>>>>>>>>>> out of sync.
>>>>>>>>>>>>> remote: Please contact [hidden email] to
>> have
>>>>>>>>> infrastructure
>>>>>>>>>>>>> resolve the issue.
>>>>>>>>>>>>> remote:
>>>>>>>>>>>>> To https://gitbox.apache.org/repos/asf/flink.git
>>>>>>>>>>>>> ! [remote rejected]       master -> master
>>> (pre-receive
>>>>> hook
>>>>>>>>>> declined)
>>>>>>>>>>>>> error: failed to push some refs to '
>>>>>>>>>>>>> https://gitbox.apache.org/repos/asf/flink.git'
>>>>>>>>>>>>> ```
>>>>>>>>>>>>>
>>>>>>>>>>>>> This is quite a new issue that didn't come till two
>> or
>>>>> three
>>>>>>>> weeks
>>>>>>>>>>> ago. I
>>>>>>>>>>>>> researched online with no luck. I also reported it to
>>> ASF
>>>>>> INFRA
>>>>>>>> [1]
>>>>>>>>>> but
>>>>>>>>>>>>> their suggested solution doesn't work.
>>>>>>>>>>>>>
>>>>>>>>>>>>> The issue however usually goes away the next morning
>> in
>>>>> PST,
>>>>>>> so I
>>>>>>>>>>> assume
>>>>>>>>>>>>> someone from a different timezone in Asia or Europe
>>> fixes
>>>>> it
>>>>>>>>> somehow?
>>>>>>>>>>> Has
>>>>>>>>>>>>> anyone run into it before? How did you fix it?
>>>>>>>>>>>>>
>>>>>>>>>>>>> Thanks,
>>>>>>>>>>>>> Bowen
>>>>>>>>>>>>>
>>>>>>>>>>>>> [1]
>>>>>>>>>
>>> https://issues.apache.org/jira/projects/INFRA/issues/INFRA-18992
>>>>>>>>>>>>>
>>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>
>>