diff --git a/documentation/reference/qfieldcloud/architecture.en.md b/documentation/reference/qfieldcloud/architecture.en.md index 2691f4f2e7..c26510262c 100644 --- a/documentation/reference/qfieldcloud/architecture.en.md +++ b/documentation/reference/qfieldcloud/architecture.en.md @@ -63,7 +63,7 @@ One or more containers to consume and manage Jobs from the queue. The **[worker_wrapper] Queue Consumer** regularly polls the **[db] App Database** for new pending Jobs. Once a Job in `PENDING` status is encountered, the **[worker_wrapper] Queue Consumer** sets it to `QUEUED` status and starts processing it. Then the container will set a bunch of metadata on the Job object in the **[db] App Database** and start a completely new temporary **[qgis] Worker** container. -It waits the **[qgis] Worker** container to finish, gets the logs and stores them in the **[db] App Database**. +It waits for the **[qgis] Worker** container to finish, gets the logs and stores them in the **[db] App Database**. Finally, it updates a bunch of other Job's metadata in the **[db] App Database** based on the exit code and the logs from the **[qgis] Worker**, and sets the Job's status to `FINISHED` or `FAILED`. diff --git a/documentation/reference/qfieldcloud/jobs.en.md b/documentation/reference/qfieldcloud/jobs.en.md index f30b952251..279aa2d956 100644 --- a/documentation/reference/qfieldcloud/jobs.en.md +++ b/documentation/reference/qfieldcloud/jobs.en.md @@ -93,13 +93,13 @@ Conflicts occur when any of these conditions is met: 1) distinct users set the same attribute on the same feature to different values starting from the same old value; 2) a primary key is employed twice. -While highly unlikely have conflicts, preventing, mitigating and resolving conflicts is important to maintain data integrity in a healthy QGIS project. Here are some tips and tricks to do just that. +While highly unlikely have conflicts they may still occur. Tips to avoid conflicts: - For updating existing features based on field conditions, plan and designate the features each user will update. - Users should not change the value of the primary key attribute. -- Use a truly unique primary key, such as UUID (`uuid()`) or current timestamp (`epoch(now())`). +- Use a truly unique primary key, such as UUID (`uuid()`). ###### How to resolve conflicts?