Merge pull request #6172 from chu11/kvs_cleanup

kvs: minor cleanups

Author: mergify[bot]

src/bindings/python/flux/kvs.py

@@ -321,10 +321,6 @@ def namespace_create(flux_handle, namespace, owner=os.getuid(), flags: int = 0):
 
     Args:
         flux_handle: A Flux handle obtained from flux.Flux()
-        flags: defaults to 0, possible flag options:
-          flux.constants.FLUX_KVS_NO_MERGE - disallow merging of different commits
-          flux.constants.FLUX_KVS_TXN_COMPACT - if possible compact changes
-          flux.constants.FLUX_KVS_SYNC - flush & checkpoint commit (only against primary KVS)
         namespace: namespace to create
         owner: uid of namespace owner, defaults to caller uid
         flags: currently unused, defaults to 0

src/modules/kvs/kvs.c

@@ -1317,25 +1317,17 @@ static lookup_t *lookup_common (flux_t *h, flux_msg_handler_t *mh,
         struct flux_msg_cred cred;
         int root_seq = -1;
 
-        if (flux_request_unpack (msg, NULL, "{ s:s s:i }",
+        /* namespace, rootdir, and rootseq optional */
+        if (flux_request_unpack (msg, NULL, "{ s:s s:i s?s s?o s?i}",
                                  "key", &key,
-                                 "flags", &flags) < 0) {
+                                 "flags", &flags,
+                                 "namespace", &ns,
+                                 "rootdir", &root_dirent,
+                                 "rootseq", &root_seq) < 0) {
             flux_log_error (h, "%s: flux_request_unpack", __FUNCTION__);
             goto done;
         }
 
-        /* namespace is optional */
-        (void)flux_request_unpack (msg, NULL, "{ s:s }",
-                                   "namespace", &ns);
-
-        /* rootdir is optional */
-        (void)flux_request_unpack (msg, NULL, "{ s:o }",
-                                   "rootdir", &root_dirent);
-
-        /* rootseq is optional */
-        (void)flux_request_unpack (msg, NULL, "{ s:i }",
-                                   "rootseq", &root_seq);
-
         /* either namespace or rootdir must be specified */
         if (!ns && !root_dirent) {
             errno = EPROTO;