Prioritisation of assignments via Mgmt-API #895
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
Signed-off-by: Stefan Klotz <[email protected]>
TargetFilterQuery Signed-off-by: Stefan Klotz <[email protected]>
Signed-off-by: Stefan Klotz <[email protected]>
Signed-off-by: Stefan Klotz <[email protected]>
weight Signed-off-by: Stefan Klotz <[email protected]>
Signed-off-by: Stefan Klotz <[email protected]>
Signed-off-by: Stefan Klotz <[email protected]>
Signed-off-by: Stefan Klotz <[email protected]>
weight in multiassig mode Signed-off-by: Stefan Klotz <[email protected]>
Signed-off-by: Stefan Klotz <[email protected]>
|
Fixes #863 |
hawkbit-bot
reviewed
Oct 7, 2019
...y-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...ository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
.../main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetFilterQueryUpdateCreate.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...ory-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java
Outdated
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...it-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java
Outdated
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...itory-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDeploymentManagement.java
Outdated
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...wkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...itory-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java
Outdated
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...itory-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java
Outdated
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...sitory-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 7, 2019
...wkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutUpdate.java
Show resolved
Hide resolved
|
SonarQube analysis reported 12 issues
Watch the comments in this conversation to review them. |
StefanKlt
changed the title
Signed-off-by: Stefan Klotz <[email protected]>
StefanKlt
commented
Oct 8, 2019
...awkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java
Outdated
Show resolved
Hide resolved
feature_prioritisation_of_campaigns Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
feature_expose_action_prioritisation_to_targets Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
feature_prioritisation_of_campaigns Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
singrob
approved these changes
Oct 25, 2019
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
'origin/feature_expose_action_prioritisation_to_targets' into feature_prioritisation_of_campaigns Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
ramannas
reviewed
Oct 28, 2019
| <<<<<<< HEAD | ||
| * Updates the auto assign settings of an {@link TargetFilterQuery}. | ||
| ======= | ||
| * Updates the the auto assign settings of an {@link TargetFilterQuery}. |
There was a problem hiding this comment.
Missed these markers... they didnt hint me either :( will remove them
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
stefbehl
reviewed
Oct 28, 2019
| /** | ||
| * Implements utility methods for managing {@link Action}s | ||
| */ | ||
| public class JPAActionManagement { |
There was a problem hiding this comment.
can we rename it to JpaActionManagement (camel-case) to make it consistent with the other classes (e.g. JpaDeploymentManagement)?
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
stefbehl
reviewed
Oct 29, 2019
docs/content/apis/dmf_api.md
Outdated
| @@ -364,6 +364,8 @@ type=EVENT <br /> tenant=tenant123 <br /> thingId=abc <br /> topic=DOWNLOAD\_A | |||
|
|
|||
| If `multi.assignments.enabled` is enabled, this message is sent instead of DOWNLOAD_AND_INSTALL, DOWNLOAD, or CANCEL_DOWNLOAD | |||
| by hawkBit to initialize update, download, or cancel task(s). | |||
|
|
|||
| With weight, one can set the priority to the action. Higher the weight, more is the priority of an action. | |||
There was a problem hiding this comment.
The higher the weight, the higher the priority of an action.
stefbehl
reviewed
Oct 29, 2019
|
|
||
| **Minor** | ||
|
|
||
| * While on DMF-API a MULTI_ACTION request is sent, DDI-API only exposes the oldest open action. | ||
| * While on DMF-API a MULTI_ACTION request is sent, DDI-API only exposes the most urgent open action (according to the weight of the actions). |
There was a problem hiding this comment.
so far we only used the term "priority" ... we could use it here too: "... DDI-API only exposes the next action which has the highest priority in the list of open actions (according to their weight property)."
stefbehl
reviewed
Oct 29, 2019
| * Simple addition of a new {@link ActionStatus} entry to the {@link Action} . | ||
| * No state changes. | ||
| * Simple addition of a new {@link ActionStatus} entry to the {@link Action} | ||
| * . No state changes. |
There was a problem hiding this comment.
line break probably caused by some unintended whitespace
stefbehl
reviewed
Oct 29, 2019
| /** | ||
| * If an {@link Action} has a weight of null this value is used as weight. | ||
| */ | ||
| private int actionWeightIfAbsent = 1000; |
There was a problem hiding this comment.
my assumption has been that we want to reduce this value to represent medium priority (e.g. 500) and even make it configurable in a next step...
There was a problem hiding this comment.
updated it to 500 and also updated relevant test
stefbehl
reviewed
Oct 29, 2019
| * @return the weight of the {@link Action}s created during an auto | ||
| * assignment. | ||
| */ | ||
| Integer getAutoAssignWeight(); |
There was a problem hiding this comment.
on Rollout, we have Optional<Integer> getWeight(); - would it make sense to align this?
There was a problem hiding this comment.
Yes, changed the return type
stefbehl
reviewed
Oct 29, 2019
| * order | ||
| * Retrieves the active {@link Action}s with the highest weights that refer | ||
| * to the given {@link Target}. If {@link Action}s have the same weight they | ||
| * are ordered ascending by ID (oldest ones first). |
There was a problem hiding this comment.
The "oldest ones first" does not make sense to me because the actions cannot have the same ID?
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
stefbehl
approved these changes
Oct 30, 2019
Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
feature_prioritisation_of_campaigns Signed-off-by: Shruthi Manavalli Ramanna <[email protected]>
schabdo
changed the title
AmmarBikic
pushed a commit
to bosch-io/hawkbit
that referenced
this pull request
Oct 2, 2020
* Updating the schema for targetfilterquery and rollout * Updating the weight validation logic and tests * Make weight optional * Fix existing multi assignment tests by adding weight, remove weight from TargetFilterQuery * Add weight validation tests, fix tests * Add mgmt api tests for assignment and getting action with weight * Add management layer validation and tests for creating rollouts with weight * Fix amqp test, add repo level validation to resource tests * Add weight to rollout mgmt-api and tests * Add weight to mgmt api target Filter create and update * Add target filter auto assign weight. disable enforcement of setting a weight in multiassign mode * Remove ignored tests, fix api doc * Fix minor findings * Fix findings * Remove hardcoded min weight * Add docu text, fix findings * Fix api documentation * Expose weight via DMF * Expose actions according to weight via ddi * Fix documentation * Add method to get actions ordered by weight to deploymentManagement * Updating the schema for targetfilterquery and rollout * Updated the indentation * Updated the helper class, fixed the randomUID in test factory * Updated the class name with prefix JPA * Adding the missing License for WeightValidationHelper class * Adding documentation to the dmf api on weight * Removed the merger markers * Updated the class name * Removed the redundant method * Addressed final PR comments * Updated the missing testcase with latest default weight value * Reverting the default value of weight back to 1000 and updated tests Signed-off-by: Shruthi Manavalli Ramanna <[email protected]> Signed-off-by: Stefan Klotz <[email protected]>
eclipsewebmaster
pushed a commit
to eclipse-hawkbit/hawkbit-website
that referenced
this pull request
Dec 15, 2022
Prioritisation of assignments via mgmt-API (see eclipse-hawkbit/hawkbit#895) Signed-off-by: Dominic Schabel <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When Multi Assignments is enabled, it is possible to define multiple distribution sets that should all be installed to a device. In that case it should be possible to specify the importance of the different distribution sets. That way the installation of a security patch will not be blocked by an other less important update.
To achieve that every action (representing the assignment of a distribution set to a target) will get a weight property. This number between (0 to 1000) represents the importance of this action (where 0 means not important and 1000 means very important) can then be exposed to the device directly or used to determine the order the actions are exposed to the device.
These changes enable an operator to specify a weight via mgmt-api when crating an manual assignment, a rollout or a target filter with an auto assignment. In case of a rollout and a target filter this weight is applied to every action resulting from it.
For now it is not mandatory for the operator to specify the weight, since it is not jet possible to do it via mgmt-UI. This should be enforced after the UI is adapted as well.