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

Fix two panics #3193

Merged
merged 3 commits into from
Jun 30, 2015
Merged

Fix two panics #3193

merged 3 commits into from
Jun 30, 2015

Conversation

jwilder
Copy link
Contributor

@jwilder jwilder commented Jun 30, 2015

  • Collected would panic when it could not start and was subsequently closed.
  • Show stats would panic the DB. Made this return an error similar to SHOW DIAGNOSTICS

@jwilder
Fix panics when collectd fails to start
87c962d 
If collectd fails to start, it can panic when close is called because
some variables have not be initialized yet.
@jwilder
Make show stats return error instead of panic
b9b80b3
otoolep
otoolep reviewed Jun 30, 2015
View reviewed changes
CHANGELOG.md
@@ -6,6 +6,7 @@
### Bugfixes

- [#3180](https://github.com/influxdb/influxdb/pull/3180): Log GOMAXPROCS, version, and commit on startup.
- [#3193](https://github.com/influxdb/influxdb/pull/3193): Fix two panics
Copy link
Contributor

Choose a reason for hiding this comment

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

I suggest we enhance this note a little -- it's not much use to someone looking to see if the panic they are experiencing was fixed. Simply "Fix panic for SHOW STATS and in collectd" would be much better.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point. Updated.

@otoolep
Copy link
Contributor

otoolep commented Jun 30, 2015

+1, though I would like to see the CHANGELOG enhanced a little.

@otoolep
Copy link
Contributor

otoolep commented Jun 30, 2015

You'll want to cherry-pick, I presume.

jwilder added a commit that referenced this pull request Jun 30, 2015
@jwilder
Merge pull request #3193 from influxdb/jw-fixes
a2bf480 
Fix two panics
@jwilder jwilder merged commit a2bf480 into master Jun 30, 2015
@jwilder jwilder deleted the jw-fixes branch June 30, 2015 15:37
@jwilder
Copy link
Contributor Author

jwilder commented Jun 30, 2015

Also cherry-picked to 0.9.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jwilder @otoolep