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.

Sign up for GitHub

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

Jump to bottom

dinautogen.sh: temporarily disable shm counters in mongo-c-driver #1219

Merged
merged 1 commit into from
Oct 12, 2016
Merged

dinautogen.sh: temporarily disable shm counters in mongo-c-driver #1219

merged 1 commit into from
Oct 12, 2016

Conversation

bkil-syslogng
Copy link
Contributor

This is a temporary quick workaround to help testing, do not merge yet.

  • TODO: extract mongo-c-driver kludges to a separate function
  • TODO: introduce configure option to reenable shm counters with warnings

@czanik
Copy link
Contributor

czanik commented Oct 3, 2016

Tested (patched latest git head, created dist file, recompiled rpm package and tested the result), and it solved the problem.

@bazsi
Copy link
Collaborator

bazsi commented Oct 11, 2016

I think this could go in as it is. It fixes a reported security issue... I have filed this bug in mongo-c-driver, let's see how that timeline works out and either update our in-tree copy, or just merge the workaround.

@bazsi
Copy link
Collaborator

bazsi commented Oct 11, 2016

https://jira.mongodb.org/plugins/servlet/mobile#issue/CDRIVER-1691/comment/1405406

They said they could fix this in their upcoming version.

@bkil-syslogng bkil-syslogng force-pushed the f/mongoc-disable-shm-cnt branch 2 times, most recently from fc60293 to 0e5dea3 Compare October 12, 2016 09:36
@bkil-syslogng
autogen.sh: temporarily disable shm counters in mongo-c-driver
64e52cb 
Be advised that this breaks mongoc-stats, so further enhancements
are welcome.

TODO: extract mongo-c-driver kludges to a separate function
TODO: introduce configure option to reenable shm counters with warnings
TODO: update mongo-c-driver after a fix is committed upstream

Upstream tracking issue:
https://jira.mongodb.org/plugins/servlet/mobile#issue/CDRIVER-1691/comment/1405406

Reported-by: Christian Boltz <syslog-ng@cboltz.de>
Tested-by: Peter Czanik <peter.czanik@balabit.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@balabit.com>
Signed-off-by: bkil-syslogng <tamas.nagy@balabit.com>
@bkil-syslogng
Copy link
Contributor Author

@bazsi
Thanks for not letting this down. I rebased to master and adjusted the commit message (please review whether it is okay), so it should still pass Travis CI. If it does not, please press the retry button...

I agree that it could go in if it does no great harm (other than breaking mongo-stats). We can commit further improvements later on, hopefully before the next release.

bazsi
bazsi approved these changes Oct 12, 2016
View reviewed changes
Copy link
Collaborator

@bazsi bazsi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks ok, and we can recert it once mongo-c-driver contains the fix.

@bazsi bazsi merged commit dda91ba into syslog-ng:master Oct 12, 2016
@bazsi
Copy link
Collaborator

bazsi commented Oct 12, 2016

@czanikp pls notify the original reporter.

@bazsi bazsi changed the title autogen.sh: temporarily disable shm counters in mongo-c-driver dinautogen.sh: temporarily disable shm counters in mongo-c-driver Oct 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bazsi bazsi bazsi approved these changes

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bkil-syslogng @czanik @bazsi