You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2015/02/27 18:37:25 UTC
mesos git commit: Fixed indentation, formatting and typos in docs.
Repository: mesos
Updated Branches:
refs/heads/master 4337411d3 -> 2985ae056
Fixed indentation, formatting and typos in docs.
Review: https://reviews.apache.org/r/31545
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2985ae05
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2985ae05
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2985ae05
Branch: refs/heads/master
Commit: 2985ae05634038b70f974bbfed6b52fe47231418
Parents: 4337411
Author: Alexander Rukletsov <al...@mesosphere.io>
Authored: Fri Feb 27 09:37:02 2015 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Feb 27 09:37:03 2015 -0800
----------------------------------------------------------------------
docs/slave-recovery.md | 26 +++++++++++++-------------
docs/upgrades.md | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2985ae05/docs/slave-recovery.md
----------------------------------------------------------------------
diff --git a/docs/slave-recovery.md b/docs/slave-recovery.md
index 5373021..4bb4a71 100644
--- a/docs/slave-recovery.md
+++ b/docs/slave-recovery.md
@@ -30,22 +30,22 @@ As part of this feature, 4 new flags were added to the slave.
with (--recover=reconnect) or kill (--recover=cleanup) old executors.
> NOTE: From Mesos 0.22.0 this flag will be removed as it will be enabled for all slaves.
- * `strict` : Whether to do recovery in strict mode [Default: true].
- * If strict=true, any and all recovery errors are considered fatal.
- * If strict=false, any errors (e.g., corruption in checkpointed data) during recovery are
+* `strict` : Whether to do recovery in strict mode [Default: true].
+ - If strict=true, any and all recovery errors are considered fatal.
+ - If strict=false, any errors (e.g., corruption in checkpointed data) during recovery are
ignored and as much state as possible is recovered.
- * `recover` : Whether to recover status updates and reconnect with old executors [Default: reconnect].
- * If recover=reconnect, Reconnect with any old live executors.
- * If recover=cleanup, Kill any old live executors and exit.
+* `recover` : Whether to recover status updates and reconnect with old executors [Default: reconnect].
+ - If recover=reconnect, Reconnect with any old live executors.
+ - If recover=cleanup, Kill any old live executors and exit.
Use this option when doing an incompatible slave or executor upgrade!).
- NOTE: If no checkpointing information exists, no recovery is performed
- and the slave registers with the master as a new slave.
+ > NOTE: If no checkpointing information exists, no recovery is performed
+ > and the slave registers with the master as a new slave.
- * `recovery_timeout` : Amount of time allotted for the slave to recover [Default: 15 mins].
- * If the slave takes longer than `recovery_timeout` to recover, any executors that are waiting to
- reconnect to the slave will self-terminate.
- NOTE: This flag is only applicable when `--checkpoint` is enabled.
+* `recovery_timeout` : Amount of time allotted for the slave to recover [Default: 15 mins].
+ - If the slave takes longer than `recovery_timeout` to recover, any executors that are waiting to
+ reconnect to the slave will self-terminate.
+ > NOTE: This flag is only applicable when `--checkpoint` is enabled.
> NOTE: If none of the frameworks have enabled checkpointing,
> executors/tasks of frameworks die when the slave dies and are not recovered.
@@ -65,4 +65,4 @@ As part of this feature, `FrameworkInfo` has been updated to include an optional
## Upgrading to 0.14.0
-If you want to upgrade a running Mesos cluster to 0.14.0 to take advantage of slave recovery please follow the [upgrade instructions](upgrades.md).
\ No newline at end of file
+If you want to upgrade a running Mesos cluster to 0.14.0 to take advantage of slave recovery please follow the [upgrade instructions](upgrades.md).
http://git-wip-us.apache.org/repos/asf/mesos/blob/2985ae05/docs/upgrades.md
----------------------------------------------------------------------
diff --git a/docs/upgrades.md b/docs/upgrades.md
index cec420d..2a15694 100644
--- a/docs/upgrades.md
+++ b/docs/upgrades.md
@@ -12,7 +12,7 @@ This document serves as a guide for users who wish to upgrade an existing mesos
slaves. Frameworks must still enable checkpointing during registration to take advantage
of checkpointing their tasks.
-**NOTE** The stats.json endpoints for masters and slaves have been depricated.
+**NOTE** The stats.json endpoints for masters and slaves have been deprecated.
Please refer to the metrics/snapshot endpoint.
**NOTE** The C++/Java/Python scheduler bindings have been updated. In particular, the driver can be constructed with an additional argument that specifies whether to use implicit driver acknowledgements. In `statusUpdate`, the `TaskStatus` now includes a UUID to make explicit acknowledgements possible.