Skip to content

Commit

Permalink
Merge pull request #1049 from owncloud/language-review-5-7
Browse files Browse the repository at this point in the history
docs: avoid sloppy language. Throu -> trough; dangling adverb 'first'…
  • Loading branch information
mmattel authored Nov 15, 2024
2 parents fab442c + ed37ccb commit e1be535
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ IMPORTANT: The graceful shutdown period is only applicable if the `storage-users

When hard-stopping Infinite Scale, for example with the `kill <pid>` command (SIGKILL), it is possible and likely that not all data from the decomposedfs (metadata) has been written to the storage which may result in an inconsistent decomposedfs. When gracefully shutting down Infinite Scale, using a command like SIGTERM, the process will no longer accept any write requests from _other_ services and will try to write the internal open requests which can take an undefined duration based on many factors. To mitigate that situation, the following things have been implemented:

* With the value of the environment variable `STORAGE_USERS_GRACEFUL_SHUTDOWN_TIMEOUT`, the `storage-users` service will delay its shutdown giving it time to finalize writing necessary data. This delay can be necessary if there is a lot of data to be saved and/or if storage access/thruput is slow. In such a case you would receive an error log entry informing you that not all data could be saved in time. To prevent such occurrences, you must increase the default value.
* With the value of the environment variable `STORAGE_USERS_GRACEFUL_SHUTDOWN_TIMEOUT`, the `storage-users` service will delay its shutdown giving it time to finalize writing necessary data. This delay can be necessary if there is a lot of data to be saved and/or if storage access/throughput is slow. In such a case you would receive an error log entry informing you that not all data could be saved in time. To prevent such occurrences, you must increase the default value.

* If a shutdown error has been logged, the command-line maintenance tool xref:maintenance/commands/commands.adoc#inspect-and-manipulate-node-metadata[Inspect and Manipulate Node Metadata] can help to fix the issue. Please contact support for details.

Expand Down
6 changes: 3 additions & 3 deletions modules/ROOT/pages/migration/upgrading-ocis.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= Upgrading Infinite Scale
:toc: right
:toclevels: 2
:description: When upgrading Infinite Scale, migration steps may be required. This document guides thru the necessary steps based on the versions used.
:description: When upgrading Infinite Scale, migration steps may be required. This document guides you through the necessary steps based on the versions used.

include::partial$multi-location/compose-version.adoc[]

Expand All @@ -11,9 +11,9 @@ include::partial$multi-location/compose-version.adoc[]

NOTE: For any Infinite Scale version to upgrade to, see {ocis-downloadpage-url}/stable/?sort=time&order=desc[download.owncloud.com,window=_blank] or {docker_ocis_prod_url}[Infinite Scale image] to get the right version.

IMPORTANT: Before starting any upgrade, make a xref:maintenance/b-r/backup.adoc[backup] first.
IMPORTANT: Before starting any upgrade, first make a xref:maintenance/b-r/backup.adoc[backup].

IMPORTANT: If not explicitly mentioned, any upgrade is forward only and a backstep is neither supported nor recommended and will most likely break the instance.
IMPORTANT: If not explicitly mentioned, any upgrade is forward only and a step back is neither supported nor recommended and will most likely break the instance.

IMPORTANT: When upgrading from an older release to the desired one, *ALL* upgrade steps from each release must be taken in order and none can be skipped.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ Use the container ID identified in the following command to read the Infinite Sc
docker logs <CONTAINER ID> 2>&1 | less
----
The output prints the log from the beginning. As first entry, the initial admin password set during first startup is shown. You can scroll thru the log using the keyboard, see the https://wiki.ubuntuusers.de/less/[less description] for more details.
The output prints the log from the beginning. As first entry, the initial admin password set during first startup is shown. You can scroll through the log using the keyboard, see the https://wiki.ubuntuusers.de/less/[less description] for more details.
If no password can be identified, you must reset the admin password via the command line as described below.
Expand Down

0 comments on commit e1be535

Please sign in to comment.