#musicbrainz-devel

/

      • nikki_ joined the channel
      • alastairp joined the channel
      • ruaok joined the channel
      • ruaok
        'ello 'ello.
      • OSCON is off to a good start. :)
      • I think I've got a clue as to what is wrong with our DB server.
      • nikki_
        oh?
      • ruaok
        straight from the horses' mouth. :)
      • yeah, it turns out the size of the DB is much larger than when a clean import is done.
      • so, we need to dump our DB and reload it. to fix the biggest problems.
      • ianmcorvidae
        interesting
      • ruaok writes notes to not forget anything
      • ruaok
        and the ignite talks are happening and there is free beer.
      • navap
        Has the master database ever been dumped/reimported before?
      • ruaok loves oscon
      • ruaok
        yes, but not recently.
      • not in 1062 days anyways.
      • fortunately our tuning has bought us some time. but a dump/reimport will still take 1-2 hours. thats 1-2 hours of downtime. :-(
      • exactly how to do that, I'm not sure yet.
      • we may not have to.
      • but I won't think about that right now.
      • there is another dilemma I need to focus on first:
      • free beer.
      • :)
      • nikki
        that's a dilemma?
      • navap
        heh
      • ruaok
        if there is beer left over, thats a dilemma. I don;t want to go there.
      • ruaok runs off
      • ttfn!!
      • navap
        Of course it is! Free == good; beer == bad ;)
      • ruaok
        lol
      • nikki
        bah... I just spent ages trying to remember how to select something from the database, then eventually remembered some code where I'd done the same thing... looked at it and found out I'd already made a function to do it >_<
      • now I don't remember why I was doing this
      • navap
        haha
      • nikki joined the channel
      • nikki
        whatever it was, osx didn't approve :P
      • alastair_ joined the channel
      • navap
        warp: Looks like I was mistake about the Controller/User.pm merge, the conflict wasn't resolved the way I wanted.
      • navap reminds himself to rebase before asking to get his stuff merged in
      • Leftmost joined the channel
      • ugh uservoice is making it harder to submit anonymously, which means they're making it harder for someone to submit more than 10 votes worth of ideas :(
      • dinog joined the channel
      • nikki
        oh?
      • navap
        Well it's not that bad, they're just making an email address a requirement and then matching that email to their user database to see if you have an account. So you can't use the same email if you want to post "anonymously".
      • The good thing is that now they have a display name field for anonymous users.
      • nikki
        ah
      • navap
        I've thrown lots of random things up on UV anonymously because I'm out of votes (but only good ideas, if it's a bad idea it wasn't mine!)
      • nikki
        haha
      • I don't even have a proper email address set for mine
      • ruaok joined the channel
      • warp
        navap: I just learned from aCiD2 that rebasing is bad. you should merge master into your branch instead.
      • ianmcorvidae
        merging and rebasing are bad in different ways :P depends on the project which should be done
      • but there do seem to be more people on the 'use merge' side of the debate than the 'use rebase' side
      • warp
        ianmcorvidae: I meant in the context of musicbrainz.
      • ianmcorvidae
        yep :)
      • warp
        most branches get applied to both next and master at different times. if a branch gets merged into next, then gets rebased onto master beforing merging in master,...
      • the next and master branches will have diverged and start getting conflicts.
      • I did not know this until about a week ago :)
      • ianmcorvidae
        ooh
      • ruaok
        can we dump next and simply replace it with a new copy of master?
      • warp
        ruaok: the issue has been resolved already.
      • ruaok
        what was the solution?
      • warp
        ruaok: merge master into next and resolve any conflicts.
      • ruaok
        ok
      • warp
        most of the conflicts were my doing, because I was doing the rebasing.
      • ruaok
        ah.
      • warp
        navap: anyway, please just send me a patch with whatever needs fixing about that conflict.
      • alastair__ joined the channel
      • navap
        aw I liked rebasing since it didn't create a new commit, it felt "cleaner". But I get what you mean about master vs next.
      • Do you want the patch now? xabbu.net/mb/profile.patch
      • warp
        yay, julian assange ted talk video available.
      • navap: yeah, I liked rebasing too.
      • navap
        As to the patch: I moved the profile action (is that the right word?) out to it's own controller which is why I'm removing it from the main User controller.
      • warp
        I'll apply it in a few minutes. I've been fixing some of the tests in t/*.t, but some uncommitted changes remain in my working copy.
      • I need to double check if those changes are sound, then commit them. otherwise I'll probably forget hem as I haven't created a jira ticket for broken tests. maybe I should :)
      • navap
        hmm my stuff rarely gets merged into next, it's only when the review is finished and the branch is being merged into master does it makes its way into next.
      • So in my case wouldn't it be okay for me to continue rebasing since next isn't getting my branch?
      • warp
        yes, rebasing is ok as long as the branch hasn't been released in _some_ form.
      • navap
        Yeah
      • warp
        navap: but if e.g. I cherry-pick something out of your branches because I need those changes NOW, things already break because rebasing changes all the commits in that branch.
      • navap nods
      • so, try to avoid it :)
      • navap
        I've been treating my github account as if it weren't public because it's a *much* nicer UI to look over what I've done than gitweb :(
      • But that's obviously not the right thing to do.
      • ianmcorvidae
        local install of gitolite or something?
      • hm
      • warp
        navap: using github is perfectly fine, it doesn't cause me any trouble it all.
      • navap: but I do have your github as a remote, so I can pull out any of your branches whenever you ask me to look at something... or for stuff that is on codereview.
      • navap: so in that sense, it is public, and there is a chance that I would like to grab stuff from your branches.
      • ruaok joined the channel
      • and I try to publish most of what I do as soon as possible, because it's just a convenient backup.
      • navap
        What I meant was that I've been rebasing/force pushing all the time because I've been treating github as private, but that causes problems if someone else ever pulls any of my branches and does something further on them without me knowing.
      • warp
        now that I work from home, doing off-site backups is a bit more hassle than it used to be, so I tend to only do those about every few weeks.
      • navap: yeah, I understand.
      • navap: but from now, consider your github to be more public. especially when you've asked someone to look at a branch :)
      • navap
        Yeah will do
      • warp grabs profile.patch
      • warp
        'git am' doesn't like it :(
      • navap
        oh whoops, I just did a git diff > profile.patch, I should be doing somethingwith format-path right?
      • warp
        navap: can you use either 'git format-patch', or tell me which of your branches I should merge to get those changes?
      • navap: yes. 'git checkout my-branch; git format-patch master;'
      • but if 'my-branch' is on github, I can just get it from there.
      • navap
        There I pushed a new branch called 'profile-controller' with the commit
      • And while you're doing that can you also merge my banners branch? I updated it as per acid2's feedback on RB.
      • warp
        sure
      • navap
        You'll need to edit test's DBDefs.pm as per my notes on http://codereview.musicbrainz.org/r/770/
      • warp thinks ruaok should read the other comments in a code review before adding a comment. :P
      • warp
        navap: updated test.musicbrainz.org with your banners.
      • also merged into master, so you can close the review.
      • navap
        Great
      • Yay my server doesn't say "This is a MusicBrainz 1 server." anymore :)
      • ruaok joined the channel
      • Should I remove the second sentence from http://github.com/navap/musicbrainz-server/blob...
      • Regarding URL searching
      • warp
        oh, yes please.
      • navap
        Wow I'm impressed, I made a very minor feature request to github and they actually implemented within a few weeks.
      • Removed images are now visible in the diff whereas only ones that were added/moved were visible before. http://github.com/navap/musicbrainz-server/comp...
      • warp
        nice
      • navap goes to bed
      • ijabz joined the channel
      • alastair__
      • how terrifying
      • djce joined the channel
      • jensl joined the channel
      • zazi joined the channel
      • jensl joined the channel
      • warp joined the channel
      • warp thinks the rest of the day is a day for the beatles.
      • navap
        The Beatles \ð/
      • warp
        :)
      • navap
        warp: Do I need anything special to run prove -l t/*t? I tried it once and just got a lot of errors (it looked like the tests weren't being run).
      • Ah right, I don't have a musicbrainz_test schema set.
      • warp
        script/create_test_db.sh
      • but you probably found that by now.
      • sadly, it takes a considerably amount of time to run all tests.
      • navap
        So I have to create a new database, can I use whatever values I want for the database names as long as the schema is set to musicbrainz_test?
      • On a side note, musicbrainz_db is the actual database name, so what's the significance of READWRITE? Is that just an easier way to reference the database in the MB code?
      • Right, because you could name the database something different so the key stays constant.
      • warp
        my databases are 'musicbrainz' and 'musicbrainz_raw'. the code refers to them as READWRITE and RAWDATA.
      • navap: anyway, you don't need a new database.
      • navap: script/create_test_db.sh creates a new schema in your existing database.
      • navap
        I get ERROR: schema "musicbrainz_test" does not exist
      • warp
        hm, odd. I don't remember having to create the schema manually.
      • echo 'CREATE SCHEMA musicbrainz_test;' | ./admin/psql --profile=test READWRITE
      • echo 'CREATE SCHEMA musicbrainz_test;' | ./admin/psql --profile=test RAWDATA
      • I guess the script doesn't have the correct permissions to perform these tasks?
      • navap
        ERROR: schema "musicbrainz_test" already exists
      • warp
        echo 'DROP SCHEMA musicbrainz_test CASCADE;' | ./admin/psql --profile=test READWRITE
      • echo 'DROP SCHEMA musicbrainz_test CASCADE;' | ./admin/psql --profile=test RAWDATA
      • it also drops the schema :)