CP-51988: Fix functions not work for remote_pool repo #6095

BengangY · 2024-10-30T09:17:10Z

remote_pool repo doesn't support periodic sync updates.
Periodic sync updates should be auto-disabled when calling set_repositories and add_repository for remote_pool repo.
Update UT.

ocaml/xapi/xapi_pool.ml

ocaml/idl/datamodel_errors.ml

ocaml/xapi/xapi_pool.ml

ocaml/idl/datamodel_errors.ml

xueqingz · 2024-11-04T09:57:49Z

Java SDK build failed on:

    /**
     * If the bundle repository or remote_pool repository is enabled, it should be the only one enabled repository of the pool.
     */
    public static class RepoShouldBeSingleEnabled extends XenAPIException {
        public final String repo-type;

        /**
         * Create a new RepoShouldBeSingleEnabled
         */
        public RepoShouldBeSingleEnabled(String repo-type) {
            super("If the bundle repository or remote_pool repository is enabled, it should be the only one enabled repository of the pool.");
            this.repo-type = repo-type;
        }
    }

Consider change the name "repo-type" to "repo_type" ?

ocaml/idl/datamodel_errors.ml

BengangY · 2024-11-04T13:10:22Z

Java SDK build failed on:

    /**
     * If the bundle repository or remote_pool repository is enabled, it should be the only one enabled repository of the pool.
     */
    public static class RepoShouldBeSingleEnabled extends XenAPIException {
        public final String repo-type;

        /**
         * Create a new RepoShouldBeSingleEnabled
         */
        public RepoShouldBeSingleEnabled(String repo-type) {
            super("If the bundle repository or remote_pool repository is enabled, it should be the only one enabled repository of the pool.");
            this.repo-type = repo-type;
        }
    }

Consider change the name "repo-type" to "repo_type" ?

Updated to "repo_type" and it passed now.

lindig · 2024-11-04T13:25:23Z

ocaml/xapi-consts/api_errors.ml

-  add_error "BUNDLE_REPO_SHOULD_BE_SINGLE_ENABLED"
+let can_not_periodic_sync_updates = add_error "CAN_NOT_PERIODIC_SYNC_UPDATES"
+
+let repo_should_be_single_enabled = add_error "REPO_SHOULD_BE_SINGLE_ENABLED"


The wording is a bit odd. Does this mean that only one repo should be enabled? "repo should be single enabled" is not grammatical and ambiguous. "repo should be the single one enabled" could be something I would guess.

Does this mean that only one repo should be enabled?
If the bundle repository or remote_pool repository is enabled, it should be the only one enabled repository of the pool. Or else, multiple repos (only remote) can be enabled.

Maybe MULTIPLE_REPOS_ENABLED as an error is clear? It implies that only one should be enabled.

Maybe MULTIPLE_REPOS_ENABLED as an error is clear? It implies that only one should be enabled.

It sounds better. But there is another similar error multiple_update_repositories_enabled.

I agree renaming it to repo_should_be_the_single_one_enabled would be clearer.

gangj · 2024-11-05T02:35:02Z

ocaml/tests/test_pool_repository.ml

+            ( repo_should_be_single_enabled
+            , [
+                Record_util.repo_origin_to_string `bundle
+              ; Record_util.repo_origin_to_string `remote_pool


No remote_pool type of repo is set here

gangj · 2024-11-05T02:35:36Z

ocaml/tests/test_pool_repository.ml

+          Server_error
+            ( repo_should_be_single_enabled
+            , [
+                Record_util.repo_origin_to_string `bundle


No bundle type of repo is set here.

gangj · 2024-11-05T02:36:51Z

ocaml/tests/test_pool_repository.ml

+            ( repo_should_be_single_enabled
+            , [
+                Record_util.repo_origin_to_string `bundle
+              ; Record_util.repo_origin_to_string `remote_pool


No remote_pool type of repo is set.

gangj · 2024-11-05T02:37:21Z

ocaml/tests/test_pool_repository.ml

+          Server_error
+            ( repo_should_be_single_enabled
+            , [
+                Record_util.repo_origin_to_string `bundle


No bundle type of repo is set

1. `remote_pool` repo doesn't support periodic sync updates. 2. Periodic sync updates should be auto-disabled when calling `set_repositories` and `add_repository` for `remote_pool` repo. 3. If `remote_pool` repository is enabled, it should be the single one enabled. Signed-off-by: Bengang Yuan <[email protected]>

Signed-off-by: Bengang Yuan <[email protected]>

robhoes · 2024-11-06T11:19:26Z

ocaml/xapi-cli-server/record_util.ml

@@ -551,3 +551,11 @@ let vm_placement_policy_of_string a =
      `anti_affinity
  | s ->
      record_failure "Invalid VM placement policy, got %s" s
+
+let repo_origin_to_string = function


I don't think we need this and we can rely on the auto-generated function now. See the comment on top of this file.

BengangY marked this pull request as ready for review October 30, 2024 09:46

gangj reviewed Oct 31, 2024

View reviewed changes

ocaml/xapi/xapi_pool.ml Outdated Show resolved Hide resolved

BengangY force-pushed the private/bengangy/CP-51988 branch from a76de9a to 615326d Compare October 31, 2024 10:07

gangj approved these changes Oct 31, 2024

View reviewed changes

BengangY force-pushed the private/bengangy/CP-51988 branch from 615326d to a76cebb Compare October 31, 2024 13:45

lindig reviewed Oct 31, 2024

View reviewed changes

ocaml/idl/datamodel_errors.ml Outdated Show resolved Hide resolved

ocaml/idl/datamodel_errors.ml Outdated Show resolved Hide resolved

BengangY force-pushed the private/bengangy/CP-51988 branch from a76cebb to 340d27f Compare November 1, 2024 03:56

gangj reviewed Nov 1, 2024

View reviewed changes

ocaml/xapi/xapi_pool.ml Outdated Show resolved Hide resolved

BengangY force-pushed the private/bengangy/CP-51988 branch from 340d27f to 170c700 Compare November 4, 2024 02:57

gangj reviewed Nov 4, 2024

View reviewed changes

ocaml/idl/datamodel_errors.ml Outdated Show resolved Hide resolved

BengangY force-pushed the private/bengangy/CP-51988 branch from 170c700 to ab89079 Compare November 4, 2024 07:59

gangj reviewed Nov 4, 2024

View reviewed changes

ocaml/idl/datamodel_errors.ml Outdated Show resolved Hide resolved

BengangY force-pushed the private/bengangy/CP-51988 branch from ab89079 to 48f640f Compare November 4, 2024 12:51

BengangY requested a review from lindig November 4, 2024 13:19

lindig approved these changes Nov 4, 2024

View reviewed changes

gangj reviewed Nov 5, 2024

View reviewed changes

BengangY force-pushed the private/bengangy/CP-51988 branch from 48f640f to 98e7102 Compare November 6, 2024 10:16

BengangY added 2 commits November 6, 2024 10:27

CP-51988: UT for fix functions not work for remote_pool repo

a2a7936

Signed-off-by: Bengang Yuan <[email protected]>

BengangY force-pushed the private/bengangy/CP-51988 branch from 98e7102 to a2a7936 Compare November 6, 2024 10:29

robhoes reviewed Nov 6, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CP-51988: Fix functions not work for remote_pool repo #6095

CP-51988: Fix functions not work for remote_pool repo #6095

BengangY commented Oct 30, 2024 •

edited

Loading

xueqingz commented Nov 4, 2024

BengangY commented Nov 4, 2024

lindig Nov 4, 2024

BengangY Nov 4, 2024

lindig Nov 4, 2024

BengangY Nov 4, 2024 •

edited

Loading

gangj Nov 5, 2024 •

edited

Loading

gangj Nov 5, 2024

gangj Nov 5, 2024

gangj Nov 5, 2024

gangj Nov 5, 2024

robhoes Nov 6, 2024

CP-51988: Fix functions not work for remote_pool repo #6095

Are you sure you want to change the base?

CP-51988: Fix functions not work for remote_pool repo #6095

Conversation

BengangY commented Oct 30, 2024 • edited Loading

xueqingz commented Nov 4, 2024

BengangY commented Nov 4, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BengangY Nov 4, 2024 • edited Loading

Choose a reason for hiding this comment

gangj Nov 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BengangY commented Oct 30, 2024 •

edited

Loading

BengangY Nov 4, 2024 •

edited

Loading

gangj Nov 5, 2024 •

edited

Loading