Re: Annual branch cleanup Aug 17
Please leave the feature branch “expireAuthentication”, The RFC is in: https://cwiki.apache.org/confluence/display/GEODE/On+Demand+Geode+Authentication+Expiration+and+Re-authentication From: Owen Nichols Date: Sunday, August 1, 2021 at 1:01 AM To: dev@geode.apache.org Subject: Annual branch cleanup Aug 17 Reminder to use your personal fork whenever possible. If you do create a branch in the geode repo, please clean it up promptly. An easy way to check is https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Fgeode%2Fbranches%2Fyours&data=04%7C01%7Cjiliao%40vmware.com%7C84fa5426570740891fd408d954c295c1%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637634016979867705%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=YvU0LuJzuQpMVi2ECwT9irx%2FSfpLxCARUPVwRx%2FOI9g%3D&reserved=0 I propose to delete the branches listed below on August 17 at 3pm. If there’s any branch you want to keep for reference, please push it to your own fork before then. I will assume lazy consensus (no need to respond unless you disagree). I will delete the following branches: GEM-3288-network-interfaces revert-6429-feature/GEODE-9220-set feature/GEODE-6316 feature/GEODE-6770 feature/GEODE-7277 feature/vSphereTests feature/GEODE-7109 feature/GEODE-8118 feature/GEODE-6901 mass-test-run wip/throw-FDE-instead feature/GEODE-8324 feature/GEODE-8444 feature/change-readme-ownership feature/redis-memory-overhead feature/redis-performance-testing GEODE-9064-JMX-filter-support_1.12-02 I will delete the following branches and close their associated PR (please push to your own fork and make a new PR from there before Aug 17): upthewaterspout-skip-checks expireAuthentication feature/GEODE-9191 feature/GEODE-8278-2 This branch has previously been approved by the community to remain in the geode repo and will NOT be deleted: feature/GEODE-7665
Proposal - unprotect develop branch of geode-native
Hello everyone, Today I once again find myself between a rock and a hard place managing incoming PRs into the geode-native project. We merged a PR that passed checkin gates, then broke in the main CI pipeline. Additionally, our code formatter took an update yesterday, and now disagrees with some of the code that is already on the develop branch. I submitted a PR to fix the formatting, but it now won't pass checkin gates because of the first break, and said first break can't be reverted because it won't pass checkin gates due to formatting. I could maybe solve this problem by combining the two PRs, but then I'd pollute my Git history, which IMO is a bigger problem than either of these issues. Sadly, this happens much more often than you'd think, and every time it does it takes days to untangle this knot we've tied ourselves in, when it should take seconds or minute of my time at most. I would like to propose that we either unprotect develop on geode-native, and allow direct checkins for specific circumstances like reverting PRs or fixing things like this formatting issue. It's crazy to keep wasting my time trying to work around something with such a simple solution at hand. Thanks, Blake
Re: Proposal - unprotect develop branch of geode-native
For this situation in Geode repo, in addition to Squash, we also allow Rebase. This would allow you to put both commits in the same PR to pass checks, but still apply them to develop as separate commits. On 8/17/21, 2:20 PM, "Blake Bender" wrote: Hello everyone, Today I once again find myself between a rock and a hard place managing incoming PRs into the geode-native project. We merged a PR that passed checkin gates, then broke in the main CI pipeline. Additionally, our code formatter took an update yesterday, and now disagrees with some of the code that is already on the develop branch. I submitted a PR to fix the formatting, but it now won't pass checkin gates because of the first break, and said first break can't be reverted because it won't pass checkin gates due to formatting. I could maybe solve this problem by combining the two PRs, but then I'd pollute my Git history, which IMO is a bigger problem than either of these issues. Sadly, this happens much more often than you'd think, and every time it does it takes days to untangle this knot we've tied ourselves in, when it should take seconds or minute of my time at most. I would like to propose that we either unprotect develop on geode-native, and allow direct checkins for specific circumstances like reverting PRs or fixing things like this formatting issue. It's crazy to keep wasting my time trying to work around something with such a simple solution at hand. Thanks, Blake
RE: Proposal - unprotect develop branch of geode-native
Right, so I can keep my git history clean by: * doing a rebase-squash for PR A * (potentially) doing a rebase squash for PR B * combining A & B * resubmitting combined PR * crossing my fingers and hoping everything gets applied in the proper order to pass CI gates This work is all unnecessary, and still isn't 100% guaranteed to fix the problem. There really ought to be a way to commit directly to develop, or at least bypass checkin gates, in special circumstances. -Original Message- From: Owen Nichols Sent: Tuesday, August 17, 2021 2:26 PM To: dev@geode.apache.org Subject: Re: Proposal - unprotect develop branch of geode-native For this situation in Geode repo, in addition to Squash, we also allow Rebase. This would allow you to put both commits in the same PR to pass checks, but still apply them to develop as separate commits. On 8/17/21, 2:20 PM, "Blake Bender" wrote: Hello everyone, Today I once again find myself between a rock and a hard place managing incoming PRs into the geode-native project. We merged a PR that passed checkin gates, then broke in the main CI pipeline. Additionally, our code formatter took an update yesterday, and now disagrees with some of the code that is already on the develop branch. I submitted a PR to fix the formatting, but it now won't pass checkin gates because of the first break, and said first break can't be reverted because it won't pass checkin gates due to formatting. I could maybe solve this problem by combining the two PRs, but then I'd pollute my Git history, which IMO is a bigger problem than either of these issues. Sadly, this happens much more often than you'd think, and every time it does it takes days to untangle this knot we've tied ourselves in, when it should take seconds or minute of my time at most. I would like to propose that we either unprotect develop on geode-native, and allow direct checkins for specific circumstances like reverting PRs or fixing things like this formatting issue. It's crazy to keep wasting my time trying to work around something with such a simple solution at hand. Thanks, Blake
Re: Proposal - unprotect develop branch of geode-native
It is actually worse than described right now. Even the combining of the PRs wouldn’t pass because they can’t affect the images themselves, which need patching to pass. The images are tainted by a previous merge too. So pinning back to an older image allows one of the fixes to pass but the other to fail. If unpin the image then we get the a different failure. We simply MUST be able to override these blocks when necessary to get things back into a working state. -Jake > On Aug 17, 2021, at 2:26 PM, Owen Nichols wrote: > > For this situation in Geode repo, in addition to Squash, we also allow > Rebase. This would allow you to put both commits in the same PR to pass > checks, but still apply them to develop as separate commits. > > On 8/17/21, 2:20 PM, "Blake Bender" wrote: > >Hello everyone, > >Today I once again find myself between a rock and a hard place managing > incoming PRs into the geode-native project. We merged a PR that passed > checkin gates, then broke in the main CI pipeline. Additionally, our code > formatter took an update yesterday, and now disagrees with some of the code > that is already on the develop branch. I submitted a PR to fix the > formatting, but it now won't pass checkin gates because of the first break, > and said first break can't be reverted because it won't pass checkin gates > due to formatting. I could maybe solve this problem by combining the two > PRs, but then I'd pollute my Git history, which IMO is a bigger problem than > either of these issues. > >Sadly, this happens much more often than you'd think, and every time it > does it takes days to untangle this knot we've tied ourselves in, when it > should take seconds or minute of my time at most. I would like to propose > that we either unprotect develop on geode-native, and allow direct checkins > for specific circumstances like reverting PRs or fixing things like this > formatting issue. It's crazy to keep wasting my time trying to work around > something with such a simple solution at hand. > >Thanks, > >Blake > >
Re: Annual branch cleanup Aug 17
Sounds good @Jinmei, and thanks for point out the associated RFC for this communal branch. It's past the announced deadline and I have run the following deletions to clean up the geode repo: git push origin --delete GEM-3288-network-interfaces git push origin --delete feature/GEODE-6316 git push origin --delete feature/GEODE-6770 git push origin --delete feature/GEODE-7277 git push origin --delete feature/vSphereTests git push origin --delete feature/GEODE-7109 git push origin --delete feature/GEODE-8118 git push origin --delete feature/GEODE-6901 git push origin --delete mass-test-run git push origin --delete wip/throw-FDE-instead git push origin --delete feature/GEODE-8324 git push origin --delete feature/GEODE-8444 git push origin --delete GEODE-9064-JMX-filter-support_1.12-02 git push origin --delete feature/GEODE-8278-2 If you still have a local copy of one of these branches, please set its upstream to your personal fork to avoid accidentally pushing it back into the geode repo in the future. Thanks again to everyone for using personal forks whenever possible. The cleanup list this year was much shorter than last year. -Owen On 8/17/21, 8:54 AM, "Jinmei Liao" wrote: Please leave the feature branch “expireAuthentication”, The RFC is in: https://cwiki.apache.org/confluence/display/GEODE/On+Demand+Geode+Authentication+Expiration+and+Re-authentication From: Owen Nichols Date: Sunday, August 1, 2021 at 1:01 AM To: dev@geode.apache.org Subject: Annual branch cleanup Aug 17 Reminder to use your personal fork whenever possible. If you do create a branch in the geode repo, please clean it up promptly. An easy way to check is https://github.com/apache/geode/branches/yours I propose to delete the branches listed below on August 17 at 3pm. If there’s any branch you want to keep for reference, please push it to your own fork before then. I will assume lazy consensus (no need to respond unless you disagree). I will delete the following branches: GEM-3288-network-interfaces revert-6429-feature/GEODE-9220-set feature/GEODE-6316 feature/GEODE-6770 feature/GEODE-7277 feature/vSphereTests feature/GEODE-7109 feature/GEODE-8118 feature/GEODE-6901 mass-test-run wip/throw-FDE-instead feature/GEODE-8324 feature/GEODE-8444 feature/change-readme-ownership feature/redis-memory-overhead feature/redis-performance-testing GEODE-9064-JMX-filter-support_1.12-02 I will delete the following branches and close their associated PR (please push to your own fork and make a new PR from there before Aug 17): upthewaterspout-skip-checks expireAuthentication feature/GEODE-9191 feature/GEODE-8278-2 This branch has previously been approved by the community to remain in the geode repo and will NOT be deleted: feature/GEODE-7665
