Only complain about older config version if there was a change #3074

bazsi · 2020-01-13T17:45:07Z

Resolves #3068

On syslog-ng upgrade, if the @version: number in the config file left on the older version, a warning WARNING: Configuration file format is too old, syslog-ng is running in compatibility mode. Please update it to use the syslog-ng ... can be seen.

This PR makes it possible that a syslog-ng upgrade does not have to be followed by a version number upgrade in the config file, except there is a change in compatibility.
In a lot of cases there is no compatibility changes between 2 versions, so this saves some unnecessary config editing.

It's important, that users should still use the installed syslog-ng version number in their configuration,
even if the syslog-ng -V Config Version reports the version which is compatible with.

kira-syslogng · 2020-01-13T17:51:43Z

Build FAILURE

lib/versioning.h

gaborznagy

Approve besides the one change request about VERSION_CURRENT.

I favor if we don't make false warning messages, which is solved with this PR.
Prior this PR having the "compatibility mode" warning was just a last step reminder, we have warning messages everywhere where backward compatibility is broken.

In other words, the false warning message can be resolved also by removing the warning message about "compatibility mode". There is no action in cfg.c, every individual action to ensure compatibility is done at the given place, so this is just another reminder message to check the other warning messages.

bazsi · 2020-01-20T13:28:06Z

removed a compile error (sorry for not noticing) and also added a G_STATIC_ASSERT() to check
if VERSION_LAST_SEMANTIC_CHANGE wasn't updated properly.

kira-syslogng · 2020-01-20T13:53:45Z

Build SUCCESS

kira-syslogng · 2020-01-20T14:17:14Z

Build SUCCESS

gaborznagy

I like that we have a check now.

lib/cfg.h

gaborznagy · 2020-01-29T13:00:21Z

@bazsi Yesterday we discussed this topic and stated that we should clearly separate config version from the actual version of syslog-ng.

This means that syslog-ng -V output with Config version: could show the last semantic version, i.e. the config version.

I've shared my personal opinion on this topic before, and I would like to have some feedback on it both from you and the team (reviewers).

... from config version point of view there is no difference between 3.22 and 3.25, but I think upgrading syslog-ng itself to 3.25 and then setting the config version to 3.22 gives a false sense of an LTS version.
See #3074 (comment)

bazsi · 2020-01-30T10:44:57Z

I've just rebased/updated the branch to display the last semantic change in config-version. I did some cleanups in the naming of macros in versioning.h as I tended to forget which macro I needed and by the time I've checked it out and got it to the place I wanted to use it, I forgot it again.

The conventions I introduced are documented in the versioning.h file.

Also I changed the "Config-Version" in the --version output to use a dash in place of the space, to match conventions in that output. I don't think this has been parsed by tools until now.

Sidenote (but not included in this branch): I found that we are using SYSLOG_NG_SOURCE_REVISION at a number of places but it is not set in automake based builds, so we can quite possibly eliminate that now as the version number does contain the git commit id (or we should set it to the git commit id as it was originally intended). I

kira-syslogng · 2020-01-30T11:03:35Z

Build SUCCESS

syslog-ng/main.c

lib/versioning.h

gaborznagy

If the "Config Version" output change is reverted and the tests turn green, this can go in.

bazsi · 2020-02-13T10:55:15Z

rebased, and changed the "config version" output to use a space instead of a dash.

kira-syslogng · 2020-02-13T11:17:39Z

Build SUCCESS

bazsi · 2020-02-17T07:17:13Z

Rebased and added news entry.

kira-syslogng · 2020-02-17T07:41:52Z

Build SUCCESS

We already have defines for version numbers through versioning.h, use them. Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

This was only used for initializing ModuleInfo->core_revision, but for that purpose we were using SYSLOG_NG_SOURCE_REVISION, which was supposed to be a git commit ID, but today it is unset (in automake) or set to $VERSION (in cmake). That field is completely unused now, so should probably be removed completely. Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

The different macros became a mess (and I am about to introduce another bunch), so do some cleanups. Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

…ange Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

kira-syslogng · 2020-02-21T10:48:37Z

Build FAILURE

gaborznagy · 2020-02-21T10:53:58Z

@kira-syslogng retest this please;

gaborznagy · 2020-02-21T10:55:53Z

@bazsi I've resolved the merge conflict and pushed it.

kira-syslogng · 2020-02-21T11:14:11Z

Build SUCCESS

bazsi mentioned this pull request Jan 13, 2020

Default RPM update behavior forces compatibility mode #3068

Closed

alltilla reviewed Jan 15, 2020

View reviewed changes

lib/versioning.h Show resolved Hide resolved

gaborznagy added the user-visible-feature User visible feature label Jan 16, 2020

gaborznagy self-requested a review January 16, 2020 12:21

gaborznagy mentioned this pull request Jan 16, 2020

commit-check: support whitespaces around commas #3079

Merged

gaborznagy reviewed Jan 16, 2020

View reviewed changes

lib/versioning.h Outdated Show resolved Hide resolved

gaborznagy reviewed Jan 16, 2020

View reviewed changes

bazsi force-pushed the only-complain-about-older-config-version-if-there-was-a-change branch from 809df55 to 3e5193b Compare January 20, 2020 13:27

gaborznagy previously approved these changes Jan 20, 2020

View reviewed changes

lib/cfg.h Outdated Show resolved Hide resolved

bazsi dismissed gaborznagy’s stale review via a70d649 January 30, 2020 10:41

bazsi force-pushed the only-complain-about-older-config-version-if-there-was-a-change branch from a52275b to a70d649 Compare January 30, 2020 10:41

gaborznagy self-requested a review January 30, 2020 12:06

gaborznagy suggested changes Feb 3, 2020

View reviewed changes

syslog-ng/main.c Outdated Show resolved Hide resolved

lib/versioning.h Show resolved Hide resolved

gaborznagy previously approved these changes Feb 11, 2020

View reviewed changes

bazsi dismissed gaborznagy’s stale review via 17b77f7 February 13, 2020 10:54

bazsi force-pushed the only-complain-about-older-config-version-if-there-was-a-change branch from a70d649 to 17b77f7 Compare February 13, 2020 10:54

bazsi force-pushed the only-complain-about-older-config-version-if-there-was-a-change branch from 17b77f7 to 51db0ab Compare February 17, 2020 07:17

gaborznagy previously approved these changes Feb 17, 2020

View reviewed changes

gaborznagy mentioned this pull request Feb 17, 2020

Documentation link update #3132

Merged

lbudai added this to the syslog-ng-3.26 milestone Feb 19, 2020

bazsi added 6 commits February 21, 2020 11:28

lib, modules: don't use numeric version identifiers

c34c9bf

We already have defines for version numbers through versioning.h, use them. Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

versioning: introduce some conventions into macro naming

5e28b29

The different macros became a mess (and I am about to introduce another bunch), so do some cleanups. Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

cfg: only kick in compatibility mode if we have an actual semantic ch…

daf6bf7

…ange Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

syslog-ng/main: show Config-Version to the last semantic change

e1ef0e8

Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

news: added news entry for 3074

6c41a97

Signed-off-by: Balazs Scheidler <bazsi77@gmail.com>

gaborznagy dismissed their stale review via 6c41a97 February 21, 2020 10:48

gaborznagy force-pushed the only-complain-about-older-config-version-if-there-was-a-change branch from 51db0ab to 6c41a97 Compare February 21, 2020 10:48

gaborznagy approved these changes Feb 21, 2020

View reviewed changes

MrAnno approved these changes Feb 21, 2020

View reviewed changes

MrAnno merged commit a519190 into syslog-ng:master Feb 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Only complain about older config version if there was a change #3074

Only complain about older config version if there was a change #3074

bazsi commented Jan 13, 2020 •

edited by gaborznagy

kira-syslogng commented Jan 13, 2020

gaborznagy left a comment

bazsi commented Jan 20, 2020

kira-syslogng commented Jan 20, 2020

kira-syslogng commented Jan 20, 2020

gaborznagy left a comment

gaborznagy commented Jan 29, 2020

bazsi commented Jan 30, 2020

kira-syslogng commented Jan 30, 2020

gaborznagy left a comment

bazsi commented Feb 13, 2020

kira-syslogng commented Feb 13, 2020

bazsi commented Feb 17, 2020

kira-syslogng commented Feb 17, 2020

kira-syslogng commented Feb 21, 2020

gaborznagy commented Feb 21, 2020

gaborznagy commented Feb 21, 2020

kira-syslogng commented Feb 21, 2020

Only complain about older config version if there was a change #3074

Only complain about older config version if there was a change #3074

Conversation

bazsi commented Jan 13, 2020 • edited by gaborznagy

kira-syslogng commented Jan 13, 2020

gaborznagy left a comment

Choose a reason for hiding this comment

bazsi commented Jan 20, 2020

kira-syslogng commented Jan 20, 2020

kira-syslogng commented Jan 20, 2020

gaborznagy left a comment

Choose a reason for hiding this comment

gaborznagy commented Jan 29, 2020

bazsi commented Jan 30, 2020

kira-syslogng commented Jan 30, 2020

gaborznagy left a comment

Choose a reason for hiding this comment

bazsi commented Feb 13, 2020

kira-syslogng commented Feb 13, 2020

bazsi commented Feb 17, 2020

kira-syslogng commented Feb 17, 2020

kira-syslogng commented Feb 21, 2020

gaborznagy commented Feb 21, 2020

gaborznagy commented Feb 21, 2020

kira-syslogng commented Feb 21, 2020

bazsi commented Jan 13, 2020 •

edited by gaborznagy