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

Upgrade Fluentd to v1.2.5 and bump gem version to v0.7.0. #240

Merged
merged 1 commit into from
Sep 26, 2018

Conversation

qingling128
Copy link
Contributor

@qingling128 qingling128 commented Aug 24, 2018

Upgrade Fluentd to v1.2.5 (latest as of Aug 24, 2018) to apply this fix fluent/fluentd#1941.
Fixes #251.

@qingling128
Copy link
Contributor Author

Pending for soak test result.

@qingling128 qingling128 force-pushed the lingshi-upgrade branch 2 times, most recently from e769283 to c88db9e Compare August 24, 2018 22:26
@@ -19,7 +19,7 @@ eos
gem.test_files = gem.files.grep(/^(test)/)
gem.require_paths = ['lib']

gem.add_runtime_dependency 'fluentd', '~> 0.10'
gem.add_runtime_dependency 'fluentd', '~> 1.2', '>= 1.2.5'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Alternative
gem.add_runtime_dependency 'fluentd', '>= 0.10', '< 2'

If we'd like to have some backward compatibility for users who have Fluentd v1.2 incompatible configuration. But that means they could be exposed to the memory issue.`

Copy link
Member

Choose a reason for hiding this comment

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

I think that's fine. We'd stop supporting earlier versions of fluentd after the version bump.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cool

@qingling128
Copy link
Contributor Author

Soak test passed for Fluentd v1.2.5.rc1. Kicking off this PR so that we can build a full package. Will run soak test against the new package again.

@qingling128 qingling128 changed the title [DO NOT MERGE] Upgrade Fluentd to v1.2.5 and bump gem version to v0.7.0. Upgrade Fluentd to v1.2.5 and bump gem version to v0.7.0. Aug 27, 2018
Copy link
Member

@igorpeshansky igorpeshansky left a comment

Choose a reason for hiding this comment

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

Some comments.

@@ -19,7 +19,7 @@ eos
gem.test_files = gem.files.grep(/^(test)/)
gem.require_paths = ['lib']

gem.add_runtime_dependency 'fluentd', '~> 0.10'
gem.add_runtime_dependency 'fluentd', '~> 1.2', '>= 1.2.5'
Copy link
Member

Choose a reason for hiding this comment

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

I think that's fine. We'd stop supporting earlier versions of fluentd after the version bump.

@@ -228,7 +228,7 @@ module InternalConstants
Fluent::Plugin.register_output('google_cloud', self)

PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
PLUGIN_VERSION = '0.6.23'.freeze
PLUGIN_VERSION = '0.7.0'.freeze
Copy link
Member

Choose a reason for hiding this comment

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

See #245.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great. I will rebase when that's merged.

@@ -10,7 +10,7 @@ eos
gem.homepage =
'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
gem.license = 'Apache-2.0'
gem.version = '0.6.23'
gem.version = '0.7.0'
Copy link
Member

Choose a reason for hiding this comment

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

We have a bunch of pending changes. Do we want to wait until those are in before bumping the version?
Alternatively, should we bump the version off a clean release (so that pulling in fluentd 1.2 is the only change)? This would mean releasing 0.6.24 first.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, that makes perfect sense. I think we are releasing at v0.6.24 next week. This will definitely wait till after that.

@qingling128
Copy link
Contributor Author

Rebased off master after #245 was merged to master.

PTAL

@qingling128 qingling128 force-pushed the lingshi-upgrade branch 2 times, most recently from 1902e11 to 299181f Compare September 5, 2018 16:29
@qingling128
Copy link
Contributor Author

Rebased off master again.

Copy link
Member

@igorpeshansky igorpeshansky left a comment

Choose a reason for hiding this comment

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

LGTM :shipit:

Copy link
Contributor

@davidbtucker davidbtucker left a comment

Choose a reason for hiding this comment

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

LGTM

@qingling128 qingling128 merged commit 906df5e into master Sep 26, 2018
@qingling128 qingling128 deleted the lingshi-upgrade branch September 26, 2018 02:13
qingling128 added a commit that referenced this pull request Oct 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1.x Support Slow memory leak of Fluentd v0.14 compared to v0.12
4 participants