Project

General

Profile

Cleanup #6983

Reconcile jcsp/Diamond@calamari with ceph/diamond@wip-ceph

Added by John Spray over 10 years ago. Updated about 10 years ago.

Status:
Resolved
Priority:
Normal
Assignee:
-
Category:
Backend (graphite/diamond)
Target version:
% Done:

0%

Tags:
Backport:
Reviewed:
Affected Versions:

Description

(20:38:37) dan.mick: john.spray: at some point we'll need to reconcile your Diamond changes with github.com:/ceph/Diamond's appropriate branch
(20:39:13) dan.mick: Noah had made changes which we had not yet got upstream, but we built our package versions from there (with some package versioning changes)
(20:39:52) dan.mick: and sadly I don't quite understand the state of that repo
(20:40:36) dan.mick: I think wip-ceph-upstream is current (I think wip-ceph-upstream^ is equivalent to wip-ceph. I suppose I can verify that with git.)
(20:40:57) dan.mick: yes, but for a comment
(20:41:23) dan.mick: so the problem is the wip-ceph-upstream branch broke the unit tests and I know less than Noah about mocking
(20:41:49) dan.mick: but of course they should be rebased on master, and your changes folded in.
(20:47:55) john.spray: hmm, yes
(20:48:26) john.spray: upstream is confusing, there's an "update the ceph collector" commit that was applied and then reverted, perhaps because of breaking the unit tests
(20:48:34) john.spray: I know for a fact I've broken the unit tests in my branch :-)
(20:49:43) john.spray: I haven't looked at the per-service perf counters much, but noahs stuff for respecting the types of things more sounds sane
(20:50:24) dan.mick: yes, reverted for breaking tests

History

#1 Updated by John Spray about 10 years ago

  • Status changed from New to Resolved

jcsp/Diamond@calamari now has the stuff from the other branch too (git history won't tell you that because it was a by-hand merge of the changes)

#2 Updated by Ian Colle about 10 years ago

  • Target version changed from v1.2 Backlog to v1.2 - early

Also available in: Atom PDF