You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ozone.apache.org by Nanda kumar <na...@apache.org> on 2020/06/05 13:16:50 UTC
[DISCUSSION] Cleaning unwanted branches in Ozone codebase
Hi All,
I was going through the list of branches that we have in Ozone and found
that there are a lot of stale branches present.
It looks like most of them are created when we moved the Ozone source to
separate repository, those branches are no longer required.
I'm planning on cleaning them up.
*Required / Active Branches*
master -- Branch we use for development
HDDS-2823 -- Branch used for SCM HA
HDDS-3001 -- Branch used for NFS support
HDDS-1564 -- Branch used for multi-raft support
HDDS-2665-ofs -- Branch used for ofs
HDDS-1880-Decom -- Branch used for Decommissioining
ozone-0.4.2 -- Branch used for 0.4.2 release
ozone-0.5.0 -- Branch used for 0.5.0 release
*Do we still need the following branches?*
HDDS-3710
master-stable
acceptance-coverage
debug-acceptance-timeout
integration-test-cleanup
*Branches to cleanup*
revert-969-HDDS-2562
revert-24-HDDS-2181
revert-251-HDDS-2595
revert-279-HDDS-2640
revert-334-HDDS-2704
revert-331-HDDS-2188-master
revert-472-HDDS-2920
revert-540-HDDS-2914-master
revert-632-time-interval
revert-611-s3g-memory-leak
revert-840-HDDS-3398
revert-265-HDDS-2621
HDDS-2064
HDDS-2214
HDDS-2221
HDDS-2240
HDDS-2204
HDDS-2254
HDDS-2071
HDDS-2196
HDDS-1228
HDDS-2267
HDDS-2271
HDDS-1868
HDDS-2206
HDDS-2281
HDDS-2181
HDDS-1569
HDDS-1737
HDDS-2400
HDDS-2461
HDDS-2034
HDDS-2587
HDDS-2627
HDDS-2876
HDDS-3710
HDDS-2194
HDDS-2278
HDDS-2280
HDDS-2305
HDDS-2886
Let me know if you want to retain any of the branches which are under
"Branches to cleanup".
Thanks,
Nanda
Re: [DISCUSSION] Cleaning unwanted branches in Ozone codebase
Posted by Nanda kumar <na...@apache.org>.
Stale branches are deleted. Now we should only have the below branches in
Ozone.
remotes/origin/HDDS-1564
remotes/origin/HDDS-1880-Decom
remotes/origin/HDDS-2665-ofs
remotes/origin/HDDS-2823
remotes/origin/HDDS-3001
remotes/origin/master
remotes/origin/ozone-0.4.2
remotes/origin/ozone-0.5.0
Please use the below command to refresh the branch list
*git remote prune origin*
There was a proposal from Marton to follow naming convention for branches
I propose to use a name-convention for all of the feature branches:
HDDS-XXX-lower-case-name
For example:
* HDDS-2665-ofs
I also propose to rename the existing branches to follow the naming
convention.
HDDS-2823 to HDDS-2823-scm-ha
HDDS-3001 to HDDS-3001-nfs
HDDS-1564 to HDDS-1564-multi-raft
HDDS-1880-Decom to HDDS-1880-decom
If there are no concerns, we can go ahead and rename existing branches as
well.
Thanks,
Nanda
On Tue, Jun 9, 2020 at 9:57 PM Nanda kumar <na...@apache.org> wrote:
> I’m planning on deleting the obsolete branches by Friday EOD, please let
> me know if there are any concerns.
>
> Branches marked for deletion:
>
> master-stable
> acceptance-coverage
> debug-acceptance-timeout
> integration-test-cleanup
>
> revert-969-HDDS-2562
> revert-24-HDDS-2181
> revert-251-HDDS-2595
> revert-279-HDDS-2640
> revert-334-HDDS-2704
> revert-331-HDDS-2188-master
> revert-472-HDDS-2920
> revert-540-HDDS-2914-master
> revert-632-time-interval
> revert-611-s3g-memory-leak
> revert-840-HDDS-3398
> revert-265-HDDS-2621
>
> HDDS-3710
> HDDS-2064
> HDDS-2214
> HDDS-2221
> HDDS-2240
> HDDS-2204
> HDDS-2254
> HDDS-2071
> HDDS-2196
> HDDS-1228
> HDDS-2267
> HDDS-2271
> HDDS-1868
> HDDS-2206
> HDDS-2281
> HDDS-2181
> HDDS-1569
> HDDS-1737
> HDDS-2400
> HDDS-2461
> HDDS-2034
> HDDS-2587
> HDDS-2627
> HDDS-2876
> HDDS-3710
> HDDS-2194
> HDDS-2278
> HDDS-2280
> HDDS-2305
> HDDS-2886
>
> Thanks,
> Nanda
>
> On Fri, Jun 5, 2020 at 6:46 PM Nanda kumar <na...@apache.org> wrote:
>
>> Hi All,
>>
>> I was going through the list of branches that we have in Ozone and found
>> that there are a lot of stale branches present.
>> It looks like most of them are created when we moved the Ozone source to
>> separate repository, those branches are no longer required.
>>
>> I'm planning on cleaning them up.
>>
>> *Required / Active Branches*
>> master -- Branch we use for development
>> HDDS-2823 -- Branch used for SCM HA
>> HDDS-3001 -- Branch used for NFS support
>> HDDS-1564 -- Branch used for multi-raft support
>> HDDS-2665-ofs -- Branch used for ofs
>> HDDS-1880-Decom -- Branch used for Decommissioining
>> ozone-0.4.2 -- Branch used for 0.4.2 release
>> ozone-0.5.0 -- Branch used for 0.5.0 release
>>
>> *Do we still need the following branches?*
>> HDDS-3710
>> master-stable
>> acceptance-coverage
>> debug-acceptance-timeout
>> integration-test-cleanup
>>
>> *Branches to cleanup*
>> revert-969-HDDS-2562
>> revert-24-HDDS-2181
>> revert-251-HDDS-2595
>> revert-279-HDDS-2640
>> revert-334-HDDS-2704
>> revert-331-HDDS-2188-master
>> revert-472-HDDS-2920
>> revert-540-HDDS-2914-master
>> revert-632-time-interval
>> revert-611-s3g-memory-leak
>> revert-840-HDDS-3398
>> revert-265-HDDS-2621
>> HDDS-2064
>> HDDS-2214
>> HDDS-2221
>> HDDS-2240
>> HDDS-2204
>> HDDS-2254
>> HDDS-2071
>> HDDS-2196
>> HDDS-1228
>> HDDS-2267
>> HDDS-2271
>> HDDS-1868
>> HDDS-2206
>> HDDS-2281
>> HDDS-2181
>> HDDS-1569
>> HDDS-1737
>> HDDS-2400
>> HDDS-2461
>> HDDS-2034
>> HDDS-2587
>> HDDS-2627
>> HDDS-2876
>> HDDS-3710
>> HDDS-2194
>> HDDS-2278
>> HDDS-2280
>> HDDS-2305
>> HDDS-2886
>>
>> Let me know if you want to retain any of the branches which are under
>> "Branches to cleanup".
>>
>> Thanks,
>> Nanda
>>
>
Re: [DISCUSSION] Cleaning unwanted branches in Ozone codebase
Posted by Nanda kumar <na...@apache.org>.
I’m planning on deleting the obsolete branches by Friday EOD, please let me
know if there are any concerns.
Branches marked for deletion:
master-stable
acceptance-coverage
debug-acceptance-timeout
integration-test-cleanup
revert-969-HDDS-2562
revert-24-HDDS-2181
revert-251-HDDS-2595
revert-279-HDDS-2640
revert-334-HDDS-2704
revert-331-HDDS-2188-master
revert-472-HDDS-2920
revert-540-HDDS-2914-master
revert-632-time-interval
revert-611-s3g-memory-leak
revert-840-HDDS-3398
revert-265-HDDS-2621
HDDS-3710
HDDS-2064
HDDS-2214
HDDS-2221
HDDS-2240
HDDS-2204
HDDS-2254
HDDS-2071
HDDS-2196
HDDS-1228
HDDS-2267
HDDS-2271
HDDS-1868
HDDS-2206
HDDS-2281
HDDS-2181
HDDS-1569
HDDS-1737
HDDS-2400
HDDS-2461
HDDS-2034
HDDS-2587
HDDS-2627
HDDS-2876
HDDS-3710
HDDS-2194
HDDS-2278
HDDS-2280
HDDS-2305
HDDS-2886
Thanks,
Nanda
On Fri, Jun 5, 2020 at 6:46 PM Nanda kumar <na...@apache.org> wrote:
> Hi All,
>
> I was going through the list of branches that we have in Ozone and found
> that there are a lot of stale branches present.
> It looks like most of them are created when we moved the Ozone source to
> separate repository, those branches are no longer required.
>
> I'm planning on cleaning them up.
>
> *Required / Active Branches*
> master -- Branch we use for development
> HDDS-2823 -- Branch used for SCM HA
> HDDS-3001 -- Branch used for NFS support
> HDDS-1564 -- Branch used for multi-raft support
> HDDS-2665-ofs -- Branch used for ofs
> HDDS-1880-Decom -- Branch used for Decommissioining
> ozone-0.4.2 -- Branch used for 0.4.2 release
> ozone-0.5.0 -- Branch used for 0.5.0 release
>
> *Do we still need the following branches?*
> HDDS-3710
> master-stable
> acceptance-coverage
> debug-acceptance-timeout
> integration-test-cleanup
>
> *Branches to cleanup*
> revert-969-HDDS-2562
> revert-24-HDDS-2181
> revert-251-HDDS-2595
> revert-279-HDDS-2640
> revert-334-HDDS-2704
> revert-331-HDDS-2188-master
> revert-472-HDDS-2920
> revert-540-HDDS-2914-master
> revert-632-time-interval
> revert-611-s3g-memory-leak
> revert-840-HDDS-3398
> revert-265-HDDS-2621
> HDDS-2064
> HDDS-2214
> HDDS-2221
> HDDS-2240
> HDDS-2204
> HDDS-2254
> HDDS-2071
> HDDS-2196
> HDDS-1228
> HDDS-2267
> HDDS-2271
> HDDS-1868
> HDDS-2206
> HDDS-2281
> HDDS-2181
> HDDS-1569
> HDDS-1737
> HDDS-2400
> HDDS-2461
> HDDS-2034
> HDDS-2587
> HDDS-2627
> HDDS-2876
> HDDS-3710
> HDDS-2194
> HDDS-2278
> HDDS-2280
> HDDS-2305
> HDDS-2886
>
> Let me know if you want to retain any of the branches which are under
> "Branches to cleanup".
>
> Thanks,
> Nanda
>
Re: [DISCUSSION] Cleaning unwanted branches in Ozone codebase
Posted by Nandakumar Vadivelu <nv...@cloudera.com.INVALID>.
> I propose to use a name-convention for all of the feature branches:
>
> HDDS-XXX-lower-case-name
>
> For example:
>
> * HDDS-2665-ofs
+1
If others are ok, I will rename the existing feature branches
HDDS-2823 to HDDS-2823-scm-ha
HDDS-3001 to HDDS-3001-nfs
HDDS-1564 to HDDS-1564-multi-raft
HDDS-1880-Decom to HDDS-1880-decom
> On 08-Jun-2020, at 7:30 PM, Elek, Marton <el...@apache.org> wrote:
>
>
> Thanks to work on this Nanda.
>
>> *Do we still need the following branches?*
>> HDDS-3710
>> master-stable
>> acceptance-coverage
>> debug-acceptance-timeout
>> integration-test-cleanup
>
> They can be deleted, AFAIK. acceptance-coverage can be needed to test the coverage measurement of acceptance tests. But I can recreate if needed (and will delete after the usage, I promise ;-) )
>
>
> BTW:
>
> I propose to use a name-convention for all of the feature branches:
>
> HDDS-XXX-lower-case-name
>
> For example:
>
> * HDDS-2665-ofs
>
>
> using a postfix for long-live, feature branches can help to identify them.
>
> What do you think?
>
> Thanks,
> Marton
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: ozone-dev-unsubscribe@hadoop.apache.org
> For additional commands, e-mail: ozone-dev-help@hadoop.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-dev-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-dev-help@hadoop.apache.org
Re: [DISCUSSION] Cleaning unwanted branches in Ozone codebase
Posted by "Elek, Marton" <el...@apache.org>.
Thanks to work on this Nanda.
> *Do we still need the following branches?*
> HDDS-3710
> master-stable
> acceptance-coverage
> debug-acceptance-timeout
> integration-test-cleanup
They can be deleted, AFAIK. acceptance-coverage can be needed to test
the coverage measurement of acceptance tests. But I can recreate if
needed (and will delete after the usage, I promise ;-) )
BTW:
I propose to use a name-convention for all of the feature branches:
HDDS-XXX-lower-case-name
For example:
* HDDS-2665-ofs
using a postfix for long-live, feature branches can help to identify them.
What do you think?
Thanks,
Marton
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-dev-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-dev-help@hadoop.apache.org