Merge branch 'main-v4.3' into copy-of-main-v4.4

apps/emqx_management/src/emqx_mgmt_api.erl

@@ -127,11 +127,12 @@ node_query(Node, Params, {Tab, QsSchema}, QueryFun, SortFun) ->
                 true -> Meta#{count => count(Tab), hasnext => length(Rows) > Limit};
                 _ -> Meta#{count => -1, hasnext => length(Rows) > Limit}
             end,
-    NRows = case SortFun of
-                undefined -> Rows;
-                _ -> lists:sort(SortFun, Rows)
+    Data0 = lists:sublist(Rows, Limit),
+    Data = case SortFun of
+               undefined -> Data0;
+               _ -> lists:sort(SortFun, Data0)
            end,
-    #{meta => NMeta, data => lists:sublist(NRows, Limit)}.
+    #{meta => NMeta, data => Data}.
 
 %% @private
 do_query(Node, Qs, {M,F}, Start, Limit) when Node =:= node() ->

bin/emqx

@@ -879,7 +879,12 @@ case "$1" in
         ;;
     check_conf)
         generate_config "check_only"
+        INCLUDE_CONFS=$(< "$RUNNER_ETC_DIR/emqx.conf" grep "include" |awk '{print $2}'|xargs)
+        if [ "$INCLUDE_CONFS" == "" ]; then
           echo "$RUNNER_ETC_DIR/emqx.conf is ok"
+        else
+          echo "$RUNNER_ETC_DIR/emqx.conf(include $INCLUDE_CONFS) is ok"
+        fi
         ;;
 
     ctl)