Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Matthias Kuhn <[email protected]>
suricactus and m-kuhn authored Jan 16, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent f8cdca3 commit ec0713c
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion documentation/reference/qfieldcloud/architecture.en.md
Original file line number Diff line number Diff line change
@@ -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`.

4 changes: 2 additions & 2 deletions documentation/reference/qfieldcloud/jobs.en.md
Original file line number Diff line number Diff line change
@@ -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?

0 comments on commit ec0713c

Please sign in to comment.