EX-7013 lipe: exclude some printf formats

Exclude some printf formats: fid, mirror-count, stripe-count
until they are implemented.

Test-Parameters: trivial testlist=sanity-lipe-find3
Signed-off-by: Alexandre Ioffe <aioffe@ddn.com>
Change-Id: I3156c63172f25c0e7ea57ee15836aa4d005f6bbb
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50251
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Colin Faber <cfaber@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lipe/man/lipe_find3.1 b/lipe/man/lipe_find3.1
index 95b3daa..281aeb7 100644 (file)
--- a/lipe/man/lipe_find3.1
+++ b/lipe/man/lipe_find3.1
@@ -273,14 +273,8 @@ Print \fIformat\fP to the standard output, interpreting '\e' escapes
 and '%' directives. The supported directives include most supported by
 \fBfind\fP(1) and the following extensions:
 .RS
-.IP %{fid}
-file FID
 .IP %{projid}
 numerical project ID
-.IP %{mirror-count}
-FLR mirror count
-.IP %{stripe-count}
-stripe count of last instantiated component
 .IP %{xattr:NAME}
 contents of NAME xattr as a string
 .RE

diff --git a/lipe/src/lipe_find3/lf3_parse_format.c b/lipe/src/lipe_find3/lf3_parse_format.c
index ace6d68..58fb18c 100644 (file)
--- a/lipe/src/lipe_find3/lf3_parse_format.c
+++ b/lipe/src/lipe_find3/lf3_parse_format.c
@@ -294,12 +294,19 @@ width:
                // parent-fid
                // parent-fids
                // pools
-               if (strcmp(ext, "fid") == 0)
-                       LF3_EMIT_S('a', "(fid)");
-               else if (strcmp(ext, "projid") == 0 ||
-                        strcmp(ext, "stripe-count") == 0 ||
-                        strcmp(ext, "mirror-count") == 0)
-                       LF3_EMIT_N('d', "(%s)", ext);
+       /* TODO
+        *      if (strcmp(ext, "fid") == 0)
+        *              LF3_EMIT_S('a', "(fid)");
+        *      else
+        */
+                    if (strcmp(ext, "projid") == 0)
+                               LF3_EMIT_N('d', "(%s)", ext);
+       /* TODO
+        *      else if (strcmp(ext, "projid") == 0 ||
+        *              strcmp(ext, "stripe-count") == 0 ||
+        *              strcmp(ext, "mirror-count") == 0)
+        *              LF3_EMIT_N('d', "(%s)", ext);
+        */
                else if (strstartswith(ext, "xattr:"))
                        LF3_EMIT_S('a', "(or (xattr-ref-string %Q) %Q)", ext + strlen("xattr:"), "");
                else