From 75a077220d0e7c9fe4d2364b306e040bac087b8d Mon Sep 17 00:00:00 2001 From: Scott Lystig Fritchie Date: Thu, 7 May 2015 20:59:27 +0900 Subject: [PATCH] Add CONTRIBUTING.md, update README.md --- CONTRIBUTING.md | 28 ++++++++++ README.md | 134 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 146 insertions(+), 16 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..157b25d --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,28 @@ +# Contributing to the Machi project + +The most helpful way to contribute is by reporting your experience +through issues. Issues may not be updated while we review internally, +but they're still incredibly appreciated. + +Pull requests may take multiple engineers for verification and testing. If +you're passionate enough to want to learn more on how you can get +hands on in this process, reach out to +[Matt Brender](mailto:mbrender@basho.com), your developer advocate. + +Thank you for being part of the community! We love you for it. + +## General process + +Machi is still a very young project within Basho, with a small team of +developers; please bear with us as we grow out of "toddler" stage into +a more mature open source software project. + +* Fork the Machi source repo and/or the sub-projects that are affected + by your change. +* Create a topic branch for your change and checkout that branch. + git checkout -b some-topic-branch +* Make your changes and run the test suite if one is provided. +* Commit your changes and push them to your fork. +* Open pull-requests for the appropriate projects. +* Contributors will review your pull request, suggest changes, and merge it when it’s ready and/or offer feedback. +* To report a bug or issue, please open a new issue against this repository. diff --git a/README.md b/README.md index 3597ec3..4e5acd7 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,125 @@ # Machi -## Nota Bene +Our goal is a robust & reliable, distributed, highly available(*), +large file store based upon write-once registers, append-only files, +Chain Replication, and client-server style architecture. All members +of the cluster store all of the files. Distributed load +balancing/sharding of files is __outside__ of the scope of this +system. However, it is a high priority that this system be able to +integrate easily into systems that do provide distributed load +balancing, e.g., Riak Core. Although strong consistency is a major +feature of Chain Replication, first use cases will focus mainly on +eventual consistency features --- strong consistency design will be +discussed in a separate design document (read more below). -This source repo is in a state of consolidation of several -independent repos. At the moment, most of the prototype code is -expected to work -- please see the list below. +The ability for Machi to maintain strong consistency will make it +attractive as a toolkit for building things like CORFU and Tango as +well as better-known open source software such as Kafka's file +replication. (See the bibliography of the [Machi high level design +doc](./doc/high-level-machi.pdf) for further references.) -Meanwhile, see the `README`* files throughout this repo -for helpful hints. +(*) Capable of operating in ``AP mode'' or ``CP mode'' relative to the + CAP Theorem. -## Initial re-porting on 'prototype' directory +## Status: early May 2015: work is underway -* `demo-day-hack`: work started on the `slf/otp-refactoring-step2` branch - to copy code from an internal Basho "Demo Day" from the `prototype/demo-day-hack` - directory to the "official" top of this repo. The end goal of this branch - (and perhaps other branches with the `slf/otp-refactoring` prefix!) is - to create a code base of minimal, functional Machi server & client code. -* `chain-manager`: finished -* `corfurl`: finished -* `tango`: finished +The two major design documents for Machi are now ready or nearly ready +for internal Basho and external party review. Please see the +[doc](./doc) directory's [README](./doc/README.md) for details + +* Machi high level design +* Machi chain self-management design + +The work of implementing first draft of Machi is now underway. The +code from the [prototypes/demo-day](prototypes/demo-day/) directory is +being used as the initial scaffolding. + +* The chain manager is nearly ready for "AP mode" use in eventual + consistency use cases. The remaining major item is file repair, + i.e., (re)syncing file data to replicas that have been offline (due + to crashes or network partition) or added to the cluster for the + first time. + +* The Machi client/server protocol is still the hand-crafted, + artisanal, bogus protocol that I hacked together for a "demo day" + back in January and appears in the + [prototypes/demo-day](prototypes/demo-day/) code. + * Today: the only client language supported is Erlang. + * Plan: replace the current protocol to something based on Protocol Buffers + * Plan: add a protocol handler that is HTTP-like but probably not + exactly 100% REST'ish. Unless someone who really cares about an + HTTP interface that is 100% REST-ful cares to contribute some + code. (Contributions are welcome!) + * Plan: if you'd like to work on a protocol such as Thrift, UBF, + msgpack over UDP, or some other protocol, let us know by + [opening an issue](./issues/new) to discuss it. + +## Contributing to Machi: source code, documentation, etc. + +Basho Technologies, Inc. as committed to licensing all work for Machi +under the +[Apache Public License version 2](./LICENSE). All authors of source code +and documentation who agree with these licensing terms are welcome to +contribute their ideas in any form: suggested design or features, +documentation, and source code. + +Machi is still a very young project within Basho, with a small team of +developers; please bear with us as we grow out of "toddler" stage into +a more mature open source software project. +We invite all contributors to review the +[CONTRIBUTING.md](./CONTRIBUTING.md) document for guidelines for +working with the Basho development team. + +## A brief survey of this directories in this repository + +* The [doc](./doc/) directory: home for major documents about Machi: + high level design documents as well as exploration of features still + under design & review within Basho. + +* The `ebin` directory: used for compiled application code + +* The `include`, `src`, and `test` directories: contain the header + files, source files, and test code for Machi, respectively. + +* The [prototype](./prototype/) directory: contains proof of concept + code, scaffolding libraries, and other exploratory code. Curious + readers should see the [prototype/README.md](./prototype/README.md) + file for more explanation of the small sub-projects found here. + +## Development environment requirements + +All development to date has been done with Erlang/OTP version 17 on OS +X. The only known limitations for using R16 are minor type +specification difference between R16 and 17, but we strongly suggest +continuing development using version 17. + +We also assume that you have the standard UNIX/Linux developers +tool chain for C and C++ applications. Specifically, we assume `make` +is available. The utility used to compile the Machi source code, +`rebar`, is pre-compiled and included in the repo. + +There are no known OS limits at this time: any platform that supports +Erlang/OTP should be sufficient for Machi. This may change over time +(e.g., adding NIFs which can make full portability to Windows OTP +environments difficult), but it hasn't happened yet. + +## Contributions + +Basho encourages contributions to Riak from the community. Here’s how +to get started. + +* Fork the appropriate sub-projects that are affected by your change. +* Create a topic branch for your change and checkout that branch. + git checkout -b some-topic-branch +* Make your changes and run the test suite if one is provided. (see below) +* Commit your changes and push them to your fork. +* Open pull-requests for the appropriate projects. +* Contributors will review your pull request, suggest changes, and merge it when it’s ready and/or offer feedback. +* To report a bug or issue, please open a new issue against this repository. + +You can [read the full guidelines for bug reporting and code contributions](http://docs.basho.com/riak/latest/community/bugs/) on the Riak Docs. And **thank you!** Your contribution is incredible important to us. + +-The Machi team at Basho, +[Scott Lystig Fritchie](mailto:scott@basho.com), technical lead, and +[Matt Brender](mailto:mbrender@basho.com), your developer advocate. --The Machi team at Basho