Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config: fix compilation with FLB_HAVE_STATIC_CONF. #7536

Merged
merged 1 commit into from
Apr 10, 2024

Conversation

bglimepoint
Copy link
Contributor

@bglimepoint bglimepoint commented Jun 9, 2023

This is a small change to fix a compilation error when using FLB_HAVE_STATIC_CONF.


Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • [N/A] Example configuration file for the change
  • [N/A] Debug log output from testing the change
  • [N/A] Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • [N/A] Run local packaging test showing all targets (including any new ones) build.
  • [N/A] Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • [N/A] Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

@bglimepoint
Copy link
Contributor Author

bglimepoint commented Jun 9, 2023

We noticed this when trying to move to 2.1.x; but I'm not sure which branch to target for "Backport to latest stable release," (but might just be blind, so going to have a look :-) can't find a 2.1 branch? :-s )

@bglimepoint bglimepoint force-pushed the fix-static-conf branch 3 times, most recently from e6bc4f6 to 85697d5 Compare June 9, 2023 00:39
@patrick-stephens
Copy link
Contributor

2.0 branch is the intended backport target.

@bglimepoint bglimepoint temporarily deployed to pr June 19, 2023 18:13 — with GitHub Actions Inactive
@bglimepoint bglimepoint temporarily deployed to pr June 19, 2023 18:13 — with GitHub Actions Inactive
@bglimepoint bglimepoint temporarily deployed to pr June 19, 2023 18:13 — with GitHub Actions Inactive
@patrick-stephens patrick-stephens changed the title Fix compilation with FLB_HAVE_STATIC_CONF. config: fix compilation with FLB_HAVE_STATIC_CONF. Jun 19, 2023
@bglimepoint bglimepoint temporarily deployed to pr June 19, 2023 18:34 — with GitHub Actions Inactive
@bglimepoint
Copy link
Contributor Author

2.0 branch is the intended backport target.

Thanks @patrick-stephens :-)

To confirm, the bug is not present in the 2.0 branch as the sighup config reloading feature hasn't been backported to 2.0, so have just left the backport for now - hopefully that's alright :-)

@bglimepoint
Copy link
Contributor Author

Hello, we were just wondering if this is waiting for anything additional on our side? :-)

Not a stress if no one's had a chance to have look and it's just waiting for that, but wanted to check as it's a fairly simple compile error that it would be great to fix, so just wanted to check :-)

Thanks, and sorry for the noise :-)

@patrick-stephens patrick-stephens added the ok-package-test Run PR packaging tests label Jul 6, 2023
@bglimepoint bglimepoint temporarily deployed to pr August 8, 2023 08:49 — with GitHub Actions Inactive
@bglimepoint bglimepoint temporarily deployed to pr August 8, 2023 08:49 — with GitHub Actions Inactive
@bglimepoint bglimepoint temporarily deployed to pr August 8, 2023 08:50 — with GitHub Actions Inactive
@bglimepoint bglimepoint temporarily deployed to pr August 8, 2023 09:20 — with GitHub Actions Inactive
Copy link
Contributor

This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.

Copy link
Contributor

This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.

@github-actions github-actions bot added the Stale label Mar 12, 2024
Fixes the following compilation error:

```
/tmp/fluent-bit/src/fluent-bit.c:607:10: error: label at end of compound statement
     case SIGHUP:
          ^~~~~~
```

Signed-off-by: Bryce Gibson <[email protected]>
@bglimepoint
Copy link
Contributor Author

@patrick-stephens sorry to pester; but is there anything we could do to help get this merged? It's still broken in master :-s

It would appear to be a relatively unused feature (I guess?), but we do find it useful, so it would be nice to fix up FLB_HAVE_STATIC_CONF - and it is just the one line change :-s

@patrick-stephens
Copy link
Contributor

I'm not a codeowner so cannot review this section but I'll ping @edsiper and @leonardo-albertovich to see if they can look.

It would help to have some way to test it - this will also prevent it in the future. Any CI we can add to help?

@bglimepoint
Copy link
Contributor Author

Ah, thanks for the note @patrick-stephens :-)

And for the extra pings :-)

I can have a look into getting a test for this; although it hadn't been immediately obvious when I'd looked previously - but I'll see if I can take another look soon ish

All it needs is a build with the FLB_STATIC_CONF arg set, e.g. cmake -DFLB_STATIC_CONF=./fluent-bit-config.yaml - I'll try and see if I can figure out how to get that into the CI jobs :-) (Although there might be a bit of a delay on my side)

@patrick-stephens patrick-stephens merged commit d729ea0 into fluent:master Apr 10, 2024
74 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-required ok-package-test Run PR packaging tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants