591429 - Cherry pick a fix onto production SUMO

Status: RESOLVED FIXED

(Infrastructure & Operations Graveyard :: WebOps: Other, task)

Description

[Paul Craciunoiu [:paulc]]

We need to get a fix for email notifications onto production quickly, please.

Assuming production is running the 2.2.3 tag, we're not switching off of it.

Steps:
* If there are any local changes, |git stash|
* git cherry-pick 65bd8795990592e310bbe053c25f77a5c4a99e38
* Re-apply local changes: |git stash apply|
* Restart celery

No need to flush caches.

Comment 1

[Paul Craciunoiu [:paulc]]

Ricky mentions you probably need to do a |git fetch| before the cherry pick.

Comment 2

[Aravind Gottipati [:aravind]]

We are dealing with a production problem right now, this will have to wait.

Comment 3

[Aravind Gottipati [:aravind]]

I am getting ready to work on this, ping me in #webdev please.

Comment 4

[Aravind Gottipati [:aravind]]

[root@mradm02 prod]# git fetch
remote: Counting objects: 283, done.
remote: Compressing objects: 100% (143/143), done.
remote: Total 214 (delta 132), reused 106 (delta 61)
Receiving objects: 100% (214/214), 48.34 KiB, done.
Resolving deltas: 100% (132/132), completed with 44 local objects.
From http://github.com/jsocol/kitsune
 + f8a5c78...fd87bfc 2.2.x      -> origin/2.2.x  (forced update)
   6975470..2a9a37e  development -> origin/development
   4197f60..ef0e846  master     -> origin/master
 + 67ea53e...60e4e58 wiki       -> origin/wiki  (forced update)
[root@mradm02 prod]#

Comment 5

[Aravind Gottipati [:aravind]]

[root@mradm02 prod]# git stash
No local changes to save
[root@mradm02 prod]# git cherry-pick 65bd8795990592e310bbe053c25f77a5c4a99e38
Finished one cherry-pick.
[detached HEAD 4af045d] [595029] Cache solution.question to avoid a db lookup in build_solution_notification
 Author: Paul Craciunoiu <[e-mail]>
 Committer: root <[e-mail]>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:

    git config --global user.name "Your Name"
    git config --global user.email [e-mail]

If the identity used for this commit is wrong, you can fix it with:

    git commit --amend --author='Your Name <[e-mail]>'

 2 files changed, 31 insertions(+), 0 deletions(-)
[root@mradm02 prod]# git stash apply
Nothing to apply
[root@mradm02 prod]#

Comment 6

[Aravind Gottipati [:aravind]]

Restarted celery.