Skip to content

Commit

Permalink
Merge branch 'master' into linasn/read-handler-hooks
Browse files Browse the repository at this point in the history
* master: (37 commits)
  [DOCS] Separate config to allow for dev and prod setups (#2909)
  [dbnode] Add configurability for regexp DFA and FSA limits (#2926)
  [dbnode] Properly rebuild index segments if they fail verification. (#2879)
  Update development guide (#2832)
  [coordinator] Validate placement on set placement endpoint unless force set (#2922)
  [docs] Parameterize menus (#2918)
  [m3cluster/etcd] Use zap logger for etcd integration test store (#2915)
  Update ci submodule to latest (#2921)
  [storage] Add Aliyun storage class (#2908)
  [dbnode] Fix client config respecting value for connect consistency (#2914)
  [dbnode] Remove dead code in encoding package (#2920)
  [linter] more optimal linter invocation for "all" case (#2863)
  [query] Fix /m3query returning 500 on invalid query argument (#2916)
  [query] Fix invalid query resulting in 500 (#2910)
  [query] Add lookback duration from query config (#2913)
  [dbnode] Query logging (#2888)
  [dtest] API tests for /query and /query_range endpoints (#2873)
  Correct old typo (#2906)
  [dtest] Fix API incompatibilities in docker harness (#2849)
  Fix seedNodes config in local stack yaml (#2907)
  ...

# Conflicts:
#	src/query/api/v1/handler/prom/read.go
#	src/query/api/v1/handler/prom/read_instant.go
#	src/query/api/v1/httpd/handler.go
  • Loading branch information
soundvibe committed Nov 19, 2020
2 parents 4dc973a + 166bdb3 commit 362a55d
Show file tree
Hide file tree
Showing 451 changed files with 8,583 additions and 10,742 deletions.
2 changes: 1 addition & 1 deletion .buildkite/docs-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
docs:
build:
context: ./
dockerfile: ../docs/Dockerfile
dockerfile: ../docker/docs/Dockerfile
volumes:
- ../:/go/src/github.com/m3db/m3
- $SSH_AUTH_SOCK:/ssh-agent
Expand Down
6 changes: 3 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!-- Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://github.com/m3db/m3/blob/master/CONTRIBUTING.md and developer notes https://github.com/m3db/m3/blob/master/DEVELOPER.md
1. If this is your first time, please read our contributor guidelines: https://github.com/m3db/m3/blob/master/CONTRIBUTING.md and developer notes https://github.com/m3db/m3/blob/master/DEVELOPMENT.md
2. Please prefix the name of the pull request with the component you are updating in the format "[component] Change title" (for example "[dbnode] Support out of order writes") and also label this pull request according to what type of issue you are addressing. Furthermore, if this is a WIP or DRAFT PR, please create a draft PR instead: https://github.blog/2019-02-14-introducing-draft-pull-requests/
3. Ensure you have added or ran the appropriate tests for your PR: read more at https://github.com/m3db/m3/blob/master/DEVELOPER.md#testing-changes
4. Follow the instructions for writing a changelog note: read more at https://github.com/m3db/m3/blob/master/DEVELOPER.md#adding-a-changelog
3. Ensure you have added or ran the appropriate tests for your PR: read more at https://github.com/m3db/m3/blob/master/DEVELOPMENT.md#testing-changes
4. Follow the instructions for writing a changelog note: read more at https://github.com/m3db/m3/blob/master/DEVELOPMENT.md#updating-the-changelog
-->

**What this PR does / why we need it**:
Expand Down
39 changes: 38 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,41 @@
# Changelog

# 1.0.0 (PROVISIONAL - STILL WORK IN PROGRESS)
# 1.0.0

## Overview

This release makes breaking changes to the APIs and configuration to provide a simpler experience both for setup and operating M3.

- New [M3 website](https://m3db.io/).
- New [M3 documentation](https://m3db.io/docs).
- Simple [M3DB configuration](https://github.com/m3db/m3/blob/master/src/dbnode/config/m3dbnode-local-etcd.yml) and [guides](https://m3db.io/docs/quickstart/docker/).
- M3DB [hard limits](https://m3db.io/docs/operational_guide/resource_limits/) limits for high resiliency under load.
- Bootstrap rearchitecture, now able to boostrap hundreds of millions of recently written datapoints in minutes for reads on restart.
- Continued focus on baseline performance release-over-release.

## Features
- **M3DB**: Namespace resolution and retention now configured dynamically via API and stored in etcd instead of being defined statically in M3Coordinator configuration.
```
message DatabaseCreateRequest {
// ...
// Optional aggregated namespace to create in
// addition to unaggregated namespace
AggregatedNamespace aggregated_namespace = 8;
}
```
- **M3DB**: Minimal configuration file with default settings looks like:
```
coordinator: {}
db: {}
```
and includes common settings such as global query limits.

## Backwards Incompatible Changes

### Configuration
- **M3DB**: `db.bootstrap.bootstrappers` removed
- **M3DB**: `db.config` nested under `db.discovery.config` (`discovery` can optionally accept different `type`s of defaults instead of a custom `config`)
- **M3Coordinator**: `cluster.namespaces.storageMetricsType` removed
- **M3Coordinator**: `tagOptions.tagOptions` no longer supports `legacy` type
- **M3Query**: `limits.perQuery.maxComputedDatapoints` removed
Expand All @@ -31,8 +61,15 @@ listenAddress: "..."
- **M3Coordinator**: Removed deprecated URL `/api/v1/placement` in favor of stable preferred URL `/api/v1/services/m3db/placement`
- **M3Coordinator**: Removed deprecated URL `/api/v1/placement/init` in favor of stable preferred URL `/api/v1/services/m3db/placement/init`

### Package
- `github.com/m3db/m3/src/x/close` removed in favor of `github.com/m3db/m3/src/x/resource`
- `github.com/m3db/m3/src/dbnode/clock` removed in favor of `github.com/m3db/m3/src/x/clock`
- `github.com/m3db/m3/src/x/dice/dice.go` moved to `github.com/m3db/m3/src/dbnode/storage/dice.go`
- `github.com/m3db/m3/src/x/lockfile/lockfile.go` moved to `github.com/m3db/m3/src/dbnode/server/lockfile.go`

### Misc
- **M3Query**: Concept of data point limit enforcers removed in favor of the other remaining query limits (e.g. max series). This also removed metrics `cost_reporter_datapoints`, `cost_reporter_datapoints_counter`, and `cost_reporter_over_datapoints_limit`.
- Linter enabled

# 0.15.17

Expand Down
148 changes: 0 additions & 148 deletions DEVELOPER.md

This file was deleted.

Loading

0 comments on commit 362a55d

Please sign in to comment.