Quagga_OSPF - Attempt to work around Bug #6305 #265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
January 25, 2017 11:22
Quagga 1.x does not like to be killed with SIGKILL. Try to kill it more gracefully. If everything fails, eventually force a SIGKILL on (re)start because otherwise things breaks completely.
rbgarga
requested changes
Feb 6, 2017
| /bin/kill -9 `/bin/cat /var/run/quagga/zebra.pid` | ||
| # XXX: See Bug #6305 - Quagga 1.x does not like SIGKILL | ||
| #/bin/kill -9 `/bin/cat /var/run/quagga/zebra.pid` | ||
| /bin/kill `/bin/cat /var/run/quagga/zebra.pid` |
There was a problem hiding this comment.
Please just remove kill -9 line instead of commenting it out. While here, just replace /bin/kill by pkill -F
| /bin/kill -9 `/bin/cat /var/run/quagga/ospfd.pid` | ||
| # XXX: See Bug #6305 - Quagga 1.x does not like SIGKILL | ||
| #/bin/kill -9 `/bin/cat /var/run/quagga/ospfd.pid` | ||
| /bin/kill `/bin/cat /var/run/quagga/ospfd.pid` |
There was a problem hiding this comment.
Use pkill and delete commented out line
| /usr/bin/killall -9 ospfd 2>/dev/null | ||
| # XXX: See Bug #6305 - Quagga 1.x does not like SIGKILL | ||
| #/usr/bin/killall -9 zebra 2>/dev/null | ||
| #/usr/bin/killall -9 ospfd 2>/dev/null |
| /usr/bin/killall ospfd | ||
| sleep 1 | ||
| /usr/bin/killall -9 ospfd 2>/dev/null | ||
| fi |
There was a problem hiding this comment.
Use pgrep to detect if process is running
if pgrep -q zebra; then
pkill zebra
...
fi
rbgarga
requested changes
Feb 6, 2017
| @@ -303,11 +303,13 @@ EOF; | |||
| // Create rc.d file | |||
| $rc_file_stop = <<<EOF | |||
| if [ -e /var/run/quagga/zebra.pid ]; then | |||
| /bin/kill -9 `/bin/cat /var/run/quagga/zebra.pid` | |||
| # XXX: See Bug #6305 - Quagga 1.x does not like SIGKILL | |||
| /bin/pkill -F `/bin/cat /var/run/quagga/zebra.pid` | |||
There was a problem hiding this comment.
-F parameter expects a path for pidfile, no need to cat here
rbgarga
approved these changes
Feb 7, 2017
netgate-git-updates
pushed a commit
that referenced
this pull request
Feb 7, 2017
netgate-git-updates
pushed a commit
that referenced
this pull request
Aug 17, 2017
[ Robert Edmonds ] * Release 1.3.0. * Add test case for the issue in #220 (#254). * Fix issue #251, "Bad enums with multiple oneofs" (#256). * Add warning flags to my_CFLAGS (#257). * Fix namespace errors when compiled with latest protobuf (#280). * Bump minimum required header version for proto3 syntax (#282). [ Paolo Borelli ] * Turn the compiler into a protoc plugin (#206). This allows the protobuf-c compiler to be invoked as "protoc --c_out=...". For backwards compatibility, we still ship a protoc-c command, but it's a symlink to the protoc-gen-c binary. * proto3 support (#228). * Remove leftover FIXME comment (#258). * Fix proto3 "is zeroish" evaluation (#264). * Small cleanup in oneof handling (#265). * Rework is_zeroish one more time (#267). * proto3: make strings default to "" instead of NULL (#274). [ Tomek Wasilczyk ] * Fix -Wsign-compare warnings (#213). * Fix ISO C90 -Wdeclaration-after-statement warnings (#214). * Fix bigendian -Wunused-label warning (#215). [ Ilya Lipnitsky ] * protoc-c/c_message.cc: Force int size on oneof enums (#221). Fixes wrong enum generation and handling for onceof cases (#220). [ Adnan ] * Fix cmake build if built as part of an external project (#231). [ Gregory Detal ] * Remove .pb.{cc,h} in distdir instead of top_distdir in order to prevent removing files from other projects when protobuf-c is included as an autotools subproject (#232). [ Ben Farnham ] * Relax autoconf constraint from v2.64 to v2.63 so that it works on older Linux distros (#233). [ Thomas Koeckerbauer ] * rm argument fix for Solaris (#234). * Add 'const' qualifier to 'init_value' variable in generated files (#236). [ Richard Kettlewell ] * Document and extend the effect of passing NULL to ..._free_unpacked functions (#255). [ Alex Milich ] * CMake: Workaround for static builds that use MSVC (#243). [ Josh Junon ] * CMake: Allow protobuf-c to be included via include_subdirectory (#245). [ Alexei Kasatkin ] * CMake: Windows fixes (#266). This fixes the build breakage with devel/protobuf 1.3.0 [1] PR: 221572 [1] Sponsored by: Farsight Security, Inc.
netgate-git-updates
pushed a commit
that referenced
this pull request
Jun 24, 2023
ChangeLog: https://www.nlnetlabs.nl/news/2023/Jun/07/nsd-4.7.0-released/ 4.7.0 ================ FEATURES: - Merge #263: Add bash autocompletion script for nsd-control. - Fix #267: Allow unencrypted local operation of nsd-control. - Merge #269 from Fale: Add systemd service unit. - Fix #271: DNSTAP over TCP, with dnstap-ip: "127.0.0.1@3333". - dnstap over TLS, default enabled. Configured with the options dnstap-tls, dnstap-tls-server-name, dnstap-tls-cert-bundle, dnstap-tls-client-key-file and dnstap-tls-client-cert-file. BUG FIXES: - Fix #239: -Wincompatible-pointer-types warning in remote.c. - Fix configure for -Wstrict-prototypes. - Fix #262: Zone(s) not synchronizing properly via TLS. - Fix for #262: More error logging for SSL read failures for zone transfers. - Merge #265: Fix C99 compatibility issue. - Fix #266: Fix build with --without-ssl. - Fix for #267: neater variable definitions. - Fix #270: reserved identifier violation. - Fix to clean more memory on exit of dnstap collector. - Fix dnstap to not check socket path when using IP address. - Fix to compile without ssl with dnstap-tls code. - Dnstap tls code fixes. - Fix include brackets for ssl.h include statements, instead of quotes. - Fix static analyzer warning about nsd_event_method initialization. - Fix #273: Large TXT record breaks AXFR. - Fix ixfr create from adding too many record types. - Fix cirrus script for submit to coverity scan to libtoolize the configure script components config.guess and config.sub. - Fix readme status badge links. - make depend. - Fix for build to run flex and bison before compiling code that needs the headers. - Fix to remove unused whitespace from acx_nlnetlabs.m4 and config.h. - For #279: Note that autoreconf -fi creates the configure script and also the needed auxiliary files, for autoconf 2.69 and 2.71. - Fix unused variable warning in unit test, from clang compile. - Fix #240: Prefix messages originating from verifier. - Fix #275: Drop unnecessary root server checks. PR: 272096 Reported by: [email protected] (maintainer)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Quagga 1.x does not like to be killed with SIGKILL. Try to kill it more gracefully. If everything fails, eventually force a SIGKILL on (re)start because otherwise things breaks completely.