Fix the user history log #40

Merged
merged 2 commits into from May 4, 2012

Conversation

Projects
None yet
2 participants
Owner

jasongrout commented Feb 16, 2012

It turns out that the problem is two extra quote marks, accidentally added last May when making some massive changes:

28c2362#L4L617

It also exposed a problem with the queue list for cells (look in the communication with the server and you'll see an extra request for cell status, cells are queued up twice for checking, once when the evaluate cell request is sent, and once upon successful response of the evaluate request:

https://github.com/sagemath/sagenb/blob/master/sagenb/data/sage/js/notebook_lib.js#L3005

and

https://github.com/sagemath/sagenb/blob/master/sagenb/data/sage/js/notebook_lib.js#L3133

Which one of these should update the queue_id_list? @rkirov or Mike Hansen, do you remember if there is a problem for the cell to listed as running upon successful return of the eval request (i.e., delete the two lines in this pull request)?

Jason Grout added some commits Feb 16, 2012

Jason Grout
Don't queue up a cell to be running until a successful return from th…
…e evaluation request is received.

(Before this patch, the cell was queued up twice.  Now it is queued up once, upon a successful request.)
Owner

jasongrout commented May 4, 2012

@kini: do you want to review this, or is this change already in?

Owner

kini commented May 4, 2012

It doesn't seem to be in yet. The code looks good to me. Do you want it in 0.9.0? Should we create a new feature-freeze branch or something?

Owner

kini commented May 4, 2012

Well, on the other hand this is a bugfix, so it should go into the release branch anyway... I'll merge it and make a new SPKG.

kini added a commit that referenced this pull request May 4, 2012

Merge pull request #40 from jasongrout/log
Fix the user history log

@kini kini merged commit 1f1d0c2 into sagemath:master May 4, 2012

Owner

jasongrout commented May 4, 2012

Yes, it should go in. It fixes a major complaint of William's (and it's a pretty easy fix too!)

Owner

jasongrout commented May 4, 2012

I'm pretty sure this has been live on sagenb.org for a few months as well...

Owner

kini commented May 4, 2012

It's in the SPKG at trac #11080 now. And it may have been live on sagenb.org at some point, but it is not now - I just checked and the log isn't updating on sagenb.org worksheets, though there are old logs from March or so.

Owner

jasongrout commented May 4, 2012

I just pulled the latest changes (including pagination, etc.) into sagenb.org and am restarting right now.

Owner

jasongrout commented May 4, 2012

Okay, it should be live now.

Owner

jasongrout commented May 4, 2012

Sagenb.org turns out to be completely unusably slow. The python process is pegged at 100% CPU ever since starting it (at least 10-15 minutes), and it's impossible to log in. I got a listing of displayed worksheets at one point, but that was it. It may not be this commit; it could be anything since 5f0e216.

Owner

kini commented May 4, 2012

Odd. I tested these commits and they worked fine on my own machine. But then again that's my own machine. Did you try git bisecting?

Owner

jasongrout commented May 4, 2012

bisecting the major 90,000 account sagenb.org is something I can't do at the moment. I'll take a look at the commits mentioned later and see if I can spot anything.

I suspect either the pagination commit or Dan Drake's commit. I thought it odd that the one page I was able to pull up, the published worksheets page, indicated only 5 pages * 25 worksheets = 125 published worksheets. That's way too low.

Owner

jasongrout commented May 4, 2012

I reverted back to before 5f0e216, sagenb.org is now responsive, so something definitely is fishy since that commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment