From 4c3794805de244c59bbcba98df31b964cf414964 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 30 Sep 2022 19:34:04 -0400 Subject: [PATCH] doc: merge new and old governance description Signed-off-by: Josh Durgin --- doc/foundation.rst | 2 +- doc/governance.rst | 122 ++++++++++++++++++++------------- doc/governance/index.rst | 81 ---------------------- doc/start/documenting-ceph.rst | 2 +- 4 files changed, 76 insertions(+), 131 deletions(-) delete mode 100644 doc/governance/index.rst diff --git a/doc/foundation.rst b/doc/foundation.rst index b601b3987d14f..49e342c6c9d2d 100644 --- a/doc/foundation.rst +++ b/doc/foundation.rst @@ -90,7 +90,7 @@ governance body). The board is responsible for: The Ceph Foundation board is not responsible for and does not have any direct control over the technical governance of Ceph. Development and engineering activities are managed through traditional open source -processes and are overseen by the :ref:`clt`. For more +processes and are overseen by the :ref:`csc`. For more information see :ref:`governance`. Members diff --git a/doc/governance.rst b/doc/governance.rst index f8bf317f8be18..e6815a325bf55 100644 --- a/doc/governance.rst +++ b/doc/governance.rst @@ -6,55 +6,81 @@ The Ceph open source community is guided by a few different groups. -Project Leader --------------- +Key principles +============== -The Ceph project was created by Sage Weil and is led by the -Ceph Leadership Team (CLT). Each project leader is responsible for guiding the -overall direction of the project and ensuring that the developer and user -communities are healthy. + * Decision-making is consensus-driven by those who participate. + * Leadership roles are defined primarily by responsibility, not prestige or seniority. + * It is normal and healthy for these roles to be passed on to others + * Everyone's role is ultimately to serve the users and participation + is voluntary. -Committers +Bodies +------ + +Ceph Executive Council +====================== + +Responsibilities +---------------- + + * Arbiter in cases where decisions cannot be reached by consensus + * Distribute key responsibilities amongst themselves or others + * Point of contact for the project + * Representatives for Ceph foundation board meetings + * Ensure things get done + +Membership ---------- -Committers are project contributors who have write access to the central -Ceph code repositories, currently hosted on GitHub. This group of developers -is collectively empowered to make changes to the Ceph source code. + * 3 people + * Elected by the steering committee + * Candidates self-nominate or are nominated by other members + * Discussion of how roles/responsibilities may be delegated + * Ranked-choice vote by the steering committee + * 2 year terms, with one member being elected in even years, and the + other two in odd years + * Members may resign at any time, and the steering committee may vote + to appoint a replacement for the rest of their term + * members must involve >1 employer -Generally speaking, no individual should make a change in isolation: -all code contributions go through a collaborative review process (and -undergo testing) before being merged. The specifics of this process -are dynamic and evolving over time. +Current Members +^^^^^^^^^^^^^^^ -New committers are added to the project (or committers removed from -the project) at the discretion of the Ceph Leadership Team (below). -The criteria for becoming a contributor include a consistent level of -quality and engagement in the project over time. +* Dan van der Ster +* Josh Durgin +* Neha Ojha +.. _csc: -.. _clt: +Ceph Steering Committee +======================= -Ceph Leadership Team --------------------- +Responsibilities +---------------- -The Ceph Leadership Team (CLT) is a collection of component leads and -other core developers who collectively make technical decisions for -the project. These decisions are generally made by consensus, -although voting may be used if necessary. + * Elect executive council + * Amend governance model (by majority vote) + * Meet regularly to discuss and decide on tactical and strategic projects + and improvements -The CLT meets weekly via video chat to discuss any pending issues or -decisions. Minutes for the CLT meetings are published at -`https://pad.ceph.com/p/clt-weekly-minutes `_. +Membership +---------- -Committers are added to or removed from the CLT at the discretion of -the CLT itself. + * Developers, users, community members + * Voting members can be nominated and added/removed by existing + members (2/3 majority) + * Anyone may attend steering committee meetings as a non-voting participant + * Existing Ceph Leadership Team members are grandfathered in + * Membership reflected by an email list and on the Ceph website and + docs -Current CLT members are: +Current Members +^^^^^^^^^^^^^^^ * Adam King * Casey Bodley * Dan van der Ster - * David Galloway * David Orman * Ernesto Puerta * Gregory Farnum @@ -78,25 +104,24 @@ Current CLT members are: * Yuri Weinstein * Zac Dover -Component Leads ---------------- +.. _ctl: + +Component Team Leads +==================== -Each major subcomponent of the Ceph project has a lead engineer who is -responsible for guiding and coordinating development. The leads are -nominated or appointed at the discretion of the project leader or the -CLT. Leads responsibilities include: +Responsibilities +---------------- - * guiding the (usually) daily "stand-up" coordination calls over video chat - * building the development roadmap for each release cycle - * coordinating development activity between contributors - * ensuring that contributions are reviewed - * ensuring that different proposed changes do not conflict - * ensuring that testing remains robust (new features include tests, changes do not break tests, etc.) + * Manage a `component team`_ in Ceph + * Ensure PRs are reviewed and merged + * Ensure severe bug fixes are backported + * Run standups + * Bug triage, scrubs + * etc. -All component leads are included on the CLT. They are expected to -report progress and status updates to the rest of the leadership team -and to help facilitate any cross-component coordination of -development. +Team leads are selected by the executive council, generally based on +the recommendation by team members and outgoing lead. Periodic +rotation of lead responsibility among team members is encouraged. The Ceph Foundation ------------------- @@ -109,3 +134,4 @@ into the collaborative development process. For more information, see :ref:`foundation`. +.. _component team: https://ceph.io/en/community/team/ diff --git a/doc/governance/index.rst b/doc/governance/index.rst deleted file mode 100644 index 3d242b8169d9f..0000000000000 --- a/doc/governance/index.rst +++ /dev/null @@ -1,81 +0,0 @@ -Ceph Governance ---------------- - -Key principles -============== - - * Decision-making is consensus-driven by those who participate. - * Leadership roles are defined primarily by responsibility, not prestige or seniority. - * It is normal and healthy for these roles to be passed on to others - * Everyone's role is ultimately to serve the users and participation - is voluntary. - -Bodies ------- - -Ceph Executive Council -====================== - -Responsibilities -^^^^^^^^^^^^^^^^ - - * Arbiter in cases where decisions cannot be reached by consensus - * Distribute key responsibilities amongst themselves or others - * Point of contact for the project - * Representatives for Ceph foundation board meetings - * Ensure things get done - -Membership -^^^^^^^^^^ - - * 3 people - * Elected by the steering committee - * Candidates self-nominate or are nominated by other members - * Discussion of how roles/responsibilities may be delegated - * Ranked-choice vote by the steering committee - * 2 year terms, with one member being elected in even years, and the - other two in odd years - * To start, first two positions are 2-year, and 3rd is 1-year - * Members may resign at any time, and the steering committee may vote - to appoint a replacement for the rest of their term - * members must involve >1 employer - -Ceph Steering Committee -======================= - -Responsibilities -^^^^^^^^^^^^^^^^ - - * Elect executive council - * Amend governance model (by majority vote) - * Meet regularly to discuss and decide on tactical and strategic projects - and improvements - -Membership -^^^^^^^^^^ - - * Developers, users, community members - * Voting members can be nominated and added/removed by existing - members (2/3 majority) - * Anyone may attend steering committee meetings as a non-voting participant - * Existing Ceph Leadership Team members are grandfathered in - * Membership reflected by an email list and on the Ceph website and docs - -Team Leads -========== - -Responsibilities -^^^^^^^^^^^^^^^^ - - * Manage a `component team`_ in Ceph - * Ensure PRs are reviewed and merged - * Ensure severe bug fixes are backported - * Run standups - * Bug triage, scrubs - * etc. - -Selected by the executive council, generally based on the recommendation by team members and outgoing lead -Encourage periodic rotation of lead responsibility among team members - -.. _code of conduct: https://ceph.io/en/code-of-conduct/ -.. _component team: https://ceph.io/en/community/team/ diff --git a/doc/start/documenting-ceph.rst b/doc/start/documenting-ceph.rst index 50a8c891a8720..5b38b16c8cc23 100644 --- a/doc/start/documenting-ceph.rst +++ b/doc/start/documenting-ceph.rst @@ -536,7 +536,7 @@ Notify Us --------- In case The PR did not got a review within in a reasonable timeframe, please get in touch -with the corresponding component lead of the :ref:`clt`. +with the corresponding component lead :ref:`ctl`. Documentation Style Guide ========================= -- 2.39.5