fix double lock bug and cmd resume early bugs (backport #14019) #14022

mergify · 2023-07-15T20:05:54Z

This is an automatic backport of pull request #14019 done by Mergify.
Cherry-pick of 76835fd has failed:

On branch mergify/bp/dev/9.0/pr-14019
Your branch is up to date with 'origin/dev/9.0'.

You are currently cherry-picking commit 76835fd55.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   lib/mgmt_fe_client.c
	modified:   lib/mgmt_fe_client.h
	modified:   lib/vty.c
	modified:   vtysh/vtysh.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   mgmtd/mgmt_fe_adapter.c

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

NetDEF-CI · 2023-07-15T20:18:57Z

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Failed

Ubuntu 18.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Ubuntu 18.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM8BUILD/config.log/config.log.gz
Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM8BUILD/config.status/config.status

Ubuntu 20.04 amd64 build: Failed (click for details)

Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U2004AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U2004AMD64BUILD/config.status/config.status

Debian 9 amd64 build: Failed (click for details)

Debian 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI021BUILD/config.log/config.log.gz Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI021BUILD/config.status/config.status

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Redhat 9 amd64 build: Failed (click for details)

Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/RH9BUILD/config.status/config.status

Make failed for Redhat 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/RH9BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Redhat 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/RH9BUILD/config.log/config.log.gz

Ubuntu 18.04 ppc64le build: Failed (click for details)

Ubuntu 18.04 ppc64le build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804PPC64LEBUILD/config.log/config.log.gz Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804PPC64LEBUILD/config.status/config.status

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Debian 10 amd64 build: Failed (click for details)

Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB10BUILD/config.status/config.status

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB10BUILD/config.log/config.log.gz

FreeBSD 11 amd64 build: Failed (click for details)

FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI009BUILD/config.log/config.log.gz FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI009BUILD/config.status/config.status

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function 'mgmt_fe_session_handle_lockds_req_msg':
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: 'mgmt_fe_session_handle_lockds_req_msg' defined but not used [-Werror=unused-function]

Ubuntu 22.04 amd64 build: Failed (click for details)

Ubuntu 22.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U22AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 22.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U22AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U22AMD64BUILD/config.status/config.status

Ubuntu 18.04 i386 build: Failed (click for details)

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18I386BUILD/config.status/config.status
Ubuntu 18.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18I386BUILD/config.log/config.log.gz

Debian 11 amd64 build: Failed (click for details)

Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB11AMD64/config.log/config.log.gz

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB11AMD64/config.status/config.status

Ubuntu 18.04 amd64 build: Failed (click for details)

Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804AMD64/config.log/config.log.gz Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804AMD64/config.status/config.status

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Ubuntu 18.04 arm7 build: Failed (click for details)

Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM7BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

CentOS 7 amd64 build: Failed (click for details)

CentOS 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI005BUILD/config.log/config.log.gz CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI005BUILD/config.status/config.status

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI005BUILD/ErrorLog/log_make.txt)

pimd/pim_cmd_common.c:4880:2: warning: missing braces around initializer [-Wmissing-braces]
pimd/pim_cmd_common.c:4880:2: warning: (near initialization for sg.grp) [-Wmissing-braces]
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.  CC       mgmtd/mgmt.o
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)

Redhat 8 amd64 build: Failed (click for details)

Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/REDHAT8/config.status/config.status

Make failed for Redhat 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/REDHAT8/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Redhat 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/REDHAT8/config.log/config.log.gz

OpenBSD 7 amd64 build: Failed (click for details)

OpenBSD 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI011BUILD/config.status/config.status

Make failed for OpenBSD 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI011BUILD/ErrorLog/log_make.txt)

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10534: mgmtd/mgmt_fe_adapter.o] Error 1
/home/ci/cibuild.12961/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/home/ci/cibuild.12961/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd

FreeBSD 12 amd64 build: Failed (click for details)

FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/FBSD12AMD64/config.log/config.log.gz FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/FBSD12AMD64/config.status/config.status

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function 'mgmt_fe_session_handle_lockds_req_msg':
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Warnings Generated during build:

Checkout code: Successful with additional warnings

Ubuntu 18.04 arm8 build: Failed (click for details)

Make failed for Ubuntu 18.04 arm8 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM8BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Ubuntu 18.04 arm8 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM8BUILD/config.log/config.log.gz
Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM8BUILD/config.status/config.status

Ubuntu 20.04 amd64 build: Failed (click for details)

Ubuntu 20.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U2004AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 20.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U2004AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U2004AMD64BUILD/config.status/config.status

Debian 9 amd64 build: Failed (click for details)

Debian 9 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI021BUILD/config.log/config.log.gz Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI021BUILD/config.status/config.status

Make failed for Debian 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI021BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Redhat 9 amd64 build: Failed (click for details)

Redhat 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/RH9BUILD/config.status/config.status

Make failed for Redhat 9 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/RH9BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Redhat 9 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/RH9BUILD/config.log/config.log.gz

Ubuntu 18.04 ppc64le build: Failed (click for details)

Ubuntu 18.04 ppc64le build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804PPC64LEBUILD/config.log/config.log.gz Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804PPC64LEBUILD/config.status/config.status

Make failed for Ubuntu 18.04 ppc64le build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804PPC64LEBUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Debian 10 amd64 build: Failed (click for details)

Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB10BUILD/config.status/config.status

Make failed for Debian 10 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB10BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Debian 10 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB10BUILD/config.log/config.log.gz

FreeBSD 11 amd64 build: Failed (click for details)

FreeBSD 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI009BUILD/config.log/config.log.gz FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI009BUILD/config.status/config.status

Make failed for FreeBSD 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI009BUILD/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function 'mgmt_fe_session_handle_lockds_req_msg':
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: 'mgmt_fe_session_handle_lockds_req_msg' defined but not used [-Werror=unused-function]

Ubuntu 22.04 amd64 build: Failed (click for details)

Ubuntu 22.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U22AMD64BUILD/config.log/config.log.gz

Make failed for Ubuntu 22.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U22AMD64BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Ubuntu 22.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U22AMD64BUILD/config.status/config.status

Ubuntu 18.04 i386 build: Failed (click for details)

Make failed for Ubuntu 18.04 i386 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18I386BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18I386BUILD/config.status/config.status
Ubuntu 18.04 i386 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18I386BUILD/config.log/config.log.gz

Debian 11 amd64 build: Failed (click for details)

Debian 11 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB11AMD64/config.log/config.log.gz

Make failed for Debian 11 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB11AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 1591 | }
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
At top level:
mgmtd/mgmt_fe_adapter.c:627:1: error: mgmt_fe_session_handle_lockds_req_msg defined but not used [-Werror=unused-function]

Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/DEB11AMD64/config.status/config.status

Ubuntu 18.04 amd64 build: Failed (click for details)

Ubuntu 18.04 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804AMD64/config.log/config.log.gz Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804AMD64/config.status/config.status

Make failed for Ubuntu 18.04 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U1804AMD64/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Ubuntu 18.04 arm7 build: Failed (click for details)

Ubuntu 18.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM7BUILD/config.status/config.status Ubuntu 18.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM7BUILD/config.log/config.log.gz

Make failed for Ubuntu 18.04 arm7 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/U18ARM7BUILD/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

CentOS 7 amd64 build: Failed (click for details)

CentOS 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI005BUILD/config.log/config.log.gz CentOS 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI005BUILD/config.status/config.status

Make failed for CentOS 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI005BUILD/ErrorLog/log_make.txt)

pimd/pim_cmd_common.c:4880:2: warning: missing braces around initializer [-Wmissing-braces]
pimd/pim_cmd_common.c:4880:2: warning: (near initialization for sg.grp) [-Wmissing-braces]
deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.deprecation warning: io.FileInput() argument `handle_io_errors` is ignored since "Docutils 0.10 (2012-12-16)" and will soon be removed.  CC       mgmtd/mgmt.o
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: expected expression before << token
 <<<<<<< HEAD
 ^
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)

Redhat 8 amd64 build: Failed (click for details)

Redhat 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/REDHAT8/config.status/config.status

Make failed for Redhat 8 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/REDHAT8/ErrorLog/log_make.txt)

make[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function mgmt_fe_session_handle_lockds_req_msg:
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Redhat 8 amd64 build: Unknown Log <config.log.gz>
URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/REDHAT8/config.log/config.log.gz

OpenBSD 7 amd64 build: Failed (click for details)

OpenBSD 7 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI011BUILD/config.log/config.log.gz OpenBSD 7 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI011BUILD/config.status/config.status

Make failed for OpenBSD 7 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/CI011BUILD/ErrorLog/log_make.txt)

gmake  all-am
gmake[1]: Entering directory '/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
<<<<<<< HEAD
^
1 error generated.
gmake[1]: *** [Makefile:10534: mgmtd/mgmt_fe_adapter.o] Error 1
/home/ci/cibuild.12961/frr-source/doc/user/isisd.rst:43: WARNING: duplicate clicmd description of net XX.XXXX. ... .XXX.XX, other instance in fabricd
/home/ci/cibuild.12961/frr-source/doc/user/isisd.rst:53: WARNING: duplicate clicmd description of domain-password [clear | md5] <password>, other instance in fabricd

FreeBSD 12 amd64 build: Failed (click for details)

FreeBSD 12 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/FBSD12AMD64/config.log/config.log.gz FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/FBSD12AMD64/config.status/config.status

Make failed for FreeBSD 12 amd64 build:
(see full Make log at https://ci1.netdef.org/browse/FRR-PULLREQ2-12961/artifact/FBSD12AMD64/ErrorLog/log_make.txt)

gmake[1]: Entering directory '/usr/home/ci/cibuild.12961/frr-source'
mgmtd/mgmt_fe_adapter.c: In function 'mgmt_fe_session_handle_lockds_req_msg':
mgmtd/mgmt_fe_adapter.c:651:1: error: version control conflict marker in file
 <<<<<<< HEAD
 ^~~~~~~
mgmtd/mgmt_fe_adapter.c:660:9: error: invalid suffix "fd55" on integer constant
 >>>>>>> 76835fd55 (lib: mgmtd: only clear pending for the in-progress command)
mgmtd/mgmt_fe_adapter.c:1591:1: error: expected declaration or statement at end of input
 }

Report for mgmt_fe_adapter.c | 20 issues
===============================================
< WARNING: suspect code indent for conditional statements (8, 0)
< #650: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:650:
< ERROR: spaces required around that '<' (ctx:OxW)
< #651: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:651:
< ERROR: spaces required around that '==' (ctx:ExO)
< #656: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:656:
< ERROR: spaces required around that '==' (ctx:OxO)
< #656: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:656:
< ERROR: spaces required around that '==' (ctx:OxO)
< #656: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:656:
< ERROR: spaces required around that '=' (ctx:OxE)
< #656: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:656:
< WARNING: space prohibited between function name and open parenthesis '('
< #660: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:660:
< ERROR: spaces required around that '>' (ctx:OxW)
< #660: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:660:
< ERROR: spaces required around that ':' (ctx:VxW)
< #660: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:660:
< ERROR: spaces required around that ':' (ctx:VxW)
< #660: FILE: /tmp/f1-1013254/mgmt_fe_adapter.c:660:
Report for vty.c | 4 issues
===============================================
< WARNING: line over 80 characters
< #3527: FILE: /tmp/f1-1013254/vty.c:3527:
< WARNING: line over 80 characters
< #3545: FILE: /tmp/f1-1013254/vty.c:3545:

github-actions · 2023-07-16T15:39:34Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

NetDEF-CI · 2023-07-16T17:13:20Z

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12965/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Failed

Checkout code: Failed (click for details)

PullReq merge failed. Please rebase your branch:
see merge log in attachment https://ci1.netdef.org/browse/FRR-PULLREQ2-12965/artifact/CHECKOUT/ErrorLog/log_merge.txt

The lock/unlocks are being done short-circuit so they are never pending; however, the handling of the unlock notification was always resuming the command if pending was set. In all cases pending is set for another command. For example implicit commit locks then when notified its done unlocks which was clearing the set-config pending flag and resuming that command incorrectly. Signed-off-by: Christian Hopps <chopps@labn.net>

There's a workaround in the code from a bug from back in 2004, it ends and re-enters config mode anytime an `exit` is done from a level below the top-level config node (e.g., from a `router isis` node). We need to re-enter config mode with or without a lock according to how we actually entered it to begin with. fixes #13920 Signed-off-by: Christian Hopps <chopps@labn.net>

Signed-off-by: Christian Hopps <chopps@labn.net>

choppsv1 · 2023-07-16T17:20:33Z

we do not want to fix these style errors b/c they are no longer style errors in master, no reason to diverge the code

NetDEF-CI · 2023-07-16T19:58:12Z

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12966/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings

Report for vty.c | 4 issues
===============================================
< WARNING: line over 80 characters
< #3527: FILE: /tmp/f1-1242628/vty.c:3527:
< WARNING: line over 80 characters
< #3545: FILE: /tmp/f1-1242628/vty.c:3545:

mergify bot added the conflicts label Jul 15, 2023

mergify bot mentioned this pull request Jul 15, 2023

fix double lock bug and cmd resume early bugs #14019

Merged

frrbot bot added bugfix libfrr tests Topotests, make check, etc vtysh labels Jul 15, 2023

github-actions bot added dev/9.0 size/L labels Jul 15, 2023

github-actions bot added conflicts and removed conflicts labels Jul 15, 2023

choppsv1 force-pushed the mergify/bp/dev/9.0/pr-14019 branch from 709ffbc to e7382ab Compare July 16, 2023 17:12

choppsv1 added 3 commits July 16, 2023 13:18

tests: add regression test for issue $13920

318e060

Signed-off-by: Christian Hopps <chopps@labn.net>

choppsv1 force-pushed the mergify/bp/dev/9.0/pr-14019 branch from e7382ab to 318e060 Compare July 16, 2023 17:18

github-actions bot removed the conflicts label Jul 16, 2023

Jafaral merged commit 906452c into dev/9.0 Jul 17, 2023
6 checks passed

mergify bot deleted the mergify/bp/dev/9.0/pr-14019 branch July 17, 2023 04:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix double lock bug and cmd resume early bugs (backport #14019) #14022

fix double lock bug and cmd resume early bugs (backport #14019) #14022

mergify bot commented Jul 15, 2023

NetDEF-CI commented Jul 15, 2023 •

edited

Loading

Continuous Integration Result: FAILED

Get source / Pull Request: Successful

Building Stage: Failed

Warnings Generated during build:

github-actions bot commented Jul 16, 2023

NetDEF-CI commented Jul 16, 2023 •

edited

Loading

Continuous Integration Result: FAILED

Get source / Pull Request: Failed

choppsv1 commented Jul 16, 2023

NetDEF-CI commented Jul 16, 2023

fix double lock bug and cmd resume early bugs (backport #14019) #14022

fix double lock bug and cmd resume early bugs (backport #14019) #14022

Conversation

mergify bot commented Jul 15, 2023

NetDEF-CI commented Jul 15, 2023 • edited Loading

Continuous Integration Result: FAILED

Get source / Pull Request: Successful

Building Stage: Failed

Warnings Generated during build:

github-actions bot commented Jul 16, 2023

NetDEF-CI commented Jul 16, 2023 • edited Loading

Continuous Integration Result: FAILED

Get source / Pull Request: Failed

choppsv1 commented Jul 16, 2023

NetDEF-CI commented Jul 16, 2023

Continuous Integration Result: SUCCESSFUL

Warnings Generated during build:

NetDEF-CI commented Jul 15, 2023 •

edited

Loading

NetDEF-CI commented Jul 16, 2023 •

edited

Loading