Issues
#1805516: Basic upgrade path for 6.x-1.x to 6.x-3.x
#1548064: Upgrade drupalorg to support 6.x-3.x version of Apachesolr (Prep for D7 d.o)
#1549374: Upgrade drupalorg_crosssite to support 6.x-3.x version of Apachesolr (Prep for D7 d.o)
#1792104: Handle redirecting /search/apachesolr_search to /search/site
#1684952: Make drupalorg_search compatible with apachesolr-6.x-3.x
#1549496: Upgrade project to support 6.x-3.x version of Apachesolr (prep for d.o. upgrade to D7)
#1549636: Drupalorg w/ apachesolr 6.x-3.x: Suppress search box in body on search
#1804962: Restore "or filter by…" meta facet block
#1804966: Restore "Sort by:" on search pages
#1808072: Backport D7-specific render array elements
Make sure site runs ok with solr off for downtime.
Good info to know
- What are the use cases for ApacheSolr search on drupal.org?
- #1700572: Manually test all existing ApacheSolr functionality in D6 to determine what, if anything, is still broken
Process
Clean up and commit code to:drupalorg_crossite's 1549374-support-new-apachesolr branchdrupalorg's 1548064-support-new-apachesolr branch
Deploy these on dev, along with other module upgrades (see deployment instructions)Re-index & testDeploy these on staging.devdrupal.orgRe-index &test- Deploy live, using staging's index to minimize downtime
- Re-index
Deployment
- Copy /var/lib/solr/do-staging from stagingsolr to live (4.3G)
- Bring site down
- Make backups
- Enable and run http://localhost:8080/view/D.o/job/deploy_drupal.org/
- Add to settings.local.php
$conf['apachesolr_environments']['solr']['url'] = '<strong>http://link/to/the/solr/index</strong>';
- Check multisite capable
drush solr-index
- Set biases to match http://drupal.org/node/1793968#comment-6621366
- Set Facet API Meta type block title to "or filter by…" and enable on search/* pages
drush solr-mark-all
drush solr-index
to index recent content
groups.drupal.org
drush updatedb
orupdate.php
.
IMPORTANT Due to #1814818: For D6 updatedb, caches are cleared in a PHP process that precedes updates, if updates are run viadrush updatedb
, then the new facetapi blocks need to be manually positioned atadmin/build/block
ORgroupsorg
update6103
can be manually run fromupdate.php
to position the new blocks.
Noted differences between current gdo and updated version running apachesolr 6.x-3.x
- Enter your keywords is now Enter terms: on
search/site
- The current search block in the sidebar has been removed as per #1813664: Configure current_search module (solr upgrade).
Related gdo issues
Comment | File | Size | Author |
---|---|---|---|
#44 | Apache Solr - drupal.org_.png | 248.36 KB | drumm |
#35 | Apache Solr - drupal.org_.png | 355.72 KB | drumm |
#25 | Selection_067.png | 12.24 KB | jhedstrom |
#15 | bluecheese-solr-6.x.diff | 2.93 KB | drumm |
Comments
Comment #1
drummThe tentative schedule is test this week, and deploy live early next week.
Comment #2
drummFresh dev sites for solr-drupal.redesign.devdrupal.org and solr-groups.redesign.devdrupal.org are now building, they will take about an hour.
Comment #3
Senpai CreditAttribution: Senpai commentedComment #4
drummLikely 7.x issues we night use for testing checklists #1700572: Manually test all existing ApacheSolr functionality in D6 to determine what, if anything, is still broken and #1699164: [Meta] Port drupal.org's solr search functionality to D7
Comment #4.0
drummAdd another missing issue.
Comment #4.1
drummFound another issue
Comment #5
pwolanin CreditAttribution: pwolanin commentedtitle fix.
Comment #6
drummThe current status is that the dev sites are still fresh, they need their codebases updated and need to be pointed at a blank core.
Comment #7
nnewton CreditAttribution: nnewton commentedhttp://stagingsolr.drupal.org:8112/solr/do-3.x
Comment #7.0
nnewton CreditAttribution: nnewton commentedClarify staging.
Comment #8
drummupdatedb is kinda rocky:
We can either ignore these errors, and/or patch apachesolr to be more forgiving. Or maybe we need to do a complete uninstall of the previous version.
This is our custom code, we need to fix it.
Comment #8.0
drummMore deployment details.
Comment #8.1
drummQuick todo
Comment #8.2
drummanother todo
Comment #9
drummI updated the code on http://solr-drupal.redesign.devdrupal.org/ and configured solr. Running drush solr-mark-all, then solr-index says 114241 items successfully processed. 0 documents successfully sent to Solr.
Next step is figuring out why it is not sending documents.
Comment #9.0
drummanother step
Comment #9.1
drummnew dependencu
Comment #10
drummFor staging - the new core is named 'do-staging' and will become active when jetty is restarted.
Comment #10.0
drummMore issues
Comment #10.1
drummFilter by block config
Comment #10.2
drummmore config
Comment #11
drummThe staging core is ready to go when staging is.
I found another deployment step, updating project_solr, and added it to the issue summary. The dev site is working on reindexing projects. The is still uncommitted code in #1549496: Upgrade project to support 6.x-3.x version of Apachesolr (prep for d.o. upgrade to D7). I requested maintainership to do the commits, #1805376: Maintainership request for drumm.
Comment #11.0
drummFound another dependency
Comment #12
Nick_vhCurrently we need a new release of apachesolr-6.x-3.x so we can deploy that to drupal.org
Comment #12.0
Nick_vhAdding solr Basic upgrade path for 6.x-1.x to 6.x-3.x
Comment #13
Nick_vhWe also need to figure out which content types we want to index (instead of exclude)
Comment #13.0
Nick_vhmodifying the intro
Comment #13.1
Nick_vhUpdating the conf for the solr index url
Comment #13.2
Nick_vhUpdated issue summary.
Comment #13.3
drummUpdate apachesolr version
Comment #13.4
drummAdd version numbers
Comment #13.5
drummWe already have cron limit in settings.php
Comment #13.6
Nick_vhUpdated issue summary.
Comment #14
Senpai CreditAttribution: Senpai commentedThis one is @drumm's baby. Also, elevating to critical status.
Comment #14.0
Senpai CreditAttribution: Senpai commentedyet another issue
Comment #14.1
drummMore issues
Comment #14.2
drummMore specific versions.
Comment #14.3
drummCan't forget the blue cheese.
Comment #14.4
Senpai CreditAttribution: Senpai commentedGood info to know
Comment #15
drummAttached is a patch needed for bluecheese on deployment. I'm moving bluecheese_preprocess_search_result() into drupalorg_search.
Comment #15.0
drummfixed that
Comment #16
drummCorrection, moved into drupalorg_crosssite so groups gets it too.
Comment #16.0
drummbluecheese patch
Comment #17
drummI've been looking into restoring the blocks on pages like http://drupal.org/project/modules. On 1.x, these blocks are made by drupalorg_order_facet.
drupalorg_order_facet in general hasn't been working well. drupalorg_order_facet_apachesolr_facets() had been throwing errors before I committed http://drupalcode.org/project/drupalorg.git/commitdiff/35be32c34d41f48ae... and http://drupalcode.org/project/drupalorg.git/commitdiff/5506830ceeea7e380.... Currently, inside
drupalorg_order_facet_block()
, both$enabled_facets
and$facets
are empty arrays. I was able to fill $enabled_facets withIf this was working on 6.x-3.x, I'm thinking it could not have used drupalorg_order_facet module. facetapi itself only provides facets for drilling down into search results, not search results from a facet. Are we missing another module? How should this be working?
Comment #18
drummI went ahead and rewrote drupalorg_order_facet for #17. It has a lot less flexibility, and is a lot more simple. Adding new sorted result blocks requires editing the $blocks array and could be made more generic if someone else has a use for it.
http://drupalcode.org/project/drupalorg.git/commitdiff/dd1e628?hp=90d81c...
I also fixed up project_solr's category search. A value key was mismatched.
http://drupalcode.org/project/project_solr.git/commitdiff/97c1c22?hp=15b...
http://solr-drupal.redesign.devdrupal.org/project/themes and http://solr-drupal.redesign.devdrupal.org/project/modules seem good now.
Comment #19
Anonymous (not verified) CreditAttribution: Anonymous commented@drumm - Awesome work. I adapted some of the project_solr code for use in drupalorg_pbs. One thing I noticed that doesn't look right to me in project_solr.pages.inc at line 146:
Also, does the http://solr-drupal.redesign.devdrupal.org site have the full node table? I am not able to call node_load on the results I get back like you do, and I suspect it may be because http://wildkatana-drupal.redesign.devdrupal.org/ might not have the full node table. Just wanted to ask here, don't want to hijack the issue.
Comment #19.0
Anonymous (not verified) CreditAttribution: Anonymous commentedvariable will be set in drupalorg_search.install.
Comment #20
drummThose seem unused, so I removed them, http://drupalcode.org/project/project_solr.git/commitdiff/10c6527?hp=990...
All dev sites have a reduced node table. Only old issues and forum posts are removed.
Comment #21
drummI'm going to go ahead with deploying this on staging for Drupal.org.
The groups deployment may lag a bit after Drupal.org. We'll have to keep the old index up for that, which is also our rollback plan.
Comment #21.0
drummUpdated issue summary.
Comment #21.1
drummHandled with -dev
Comment #21.2
drummBranches merged
Comment #21.3
drummDone and done
Comment #21.4
drummUpdating for staging deployment
Comment #21.5
drummMerges done.
Comment #22
jhedstromI updated the summary regarding the gdo upgrade.
Comment #23
drummFor Drupal.org, we are going to try out http://drupal.org/project/apachesolr_url_switch on staging only. I have it configured with
in settings.local.php.
Comment #24
drummI indexed http://staging.devdrupal.org/ overnight, it took about 8 hours with 4 threads, which is good news.
I got the hostname wrong in the above comment, so we definitely can't use that index directly. Worst case is that we have to do a live reindexing, that's faster than 8 hours or even faster if we can use more threads. The production DB is nicer than staging. MySQL is the bottleneck.
I spot checked most things and have noticed something funny with meta facets, for example http://staging.devdrupal.org/search/site/unicorn?f[0]=ss_meta_type%3Afor....
Please test http://staging.devdrupal.org/ for other issues.
Comment #25
jhedstromSeeing a bit of extra text on the initial facet:
Looking into this now.
Comment #26
eliza411 CreditAttribution: eliza411 commentedFirst run of BDD tests are at http://drupal.org/node/1814498
I'm opening individual issues for the failed steps and updating tests where needed.
Comment #27
jhedstromI'm unable to replicate #25 in my local testing environment, so it's unclear why that is happening on staging.
Comment #28
eliza411 CreditAttribution: eliza411 commentedI opened and issue to track #25 alongside the other QA solr issues: #1815980: Solr - Extra text on the filters
Comment #29
drummAfter updating for #1808072: Backport D7-specific render array elements, I edited the facet and reverted it. It snapped back into place.
Comment #30
drumm#25 isn't fixed. FacetAPI's ability to deal with block caching in D6 is non-existant.
Comment #31
drummSpecifically, there is some D7 code commented out that might handle it.
Comment #32
drummThis is the second holdup from incomplete backports in FacetAPI. Combine this with QA finding some problems and me writing the downtime announcement, http://drupal.org/node/1816068, too late to get reviewed, I think this has to be moved to early/mid-day PDT.
Comment #33
jhedstrom#1792104: Handle redirecting /search/apachesolr_search to /search/site has been committed to the solr branch of drupalorg crosssite.
Comment #34
drummNext, I need to get groups indexing.
Comment #35
drummAttached is a screenshot of http://drupal.org/admin/settings/apachesolr/content-bias. We'll want to start with the same biases. I made a commit to exclude releases from indexing.
Groups: http://groups.drupal.org/admin/settings/apachesolr/content-bias doesn't bias any content types. We do exclude book pages, KDI proposals, and image node types from indexing.
Comment #36
drummAtt 77% indexed, #1819312: Gracefully handle invalid UTF-8 happened. I edited the blocking node and it is continuing.
Comment #37
drummGroups indexing has started.
Comment #38
drummIndexing completed on both staging.devdrupal.org and groups.staging.devdrupal.org.
To-do:
- Revise deployment instructions to include transferring solr core and associated tracking tables from staging.
- Double check content bias settings, see #35. Automate if practical.
- Test more
- See about getting association.staging.devdrupal.org indexing
- More testing couldn't hurt
Comment #39
eliza411 CreditAttribution: eliza411 commentedDo you have a way to automate bias settings? If we get our test users from git6 set up on staging, we can automate a check of the bias settings as part of the the bdd tests.
Meanwhile, I re-ran the test suite: http://bddtest.drupal.org/test-output/solr.html
I'll look into the failures and create issues tomorrow, but in case you want to see them yourself you have an up-to-date copy.
Comment #40
Nick_vhNew releases were made :
facetapi 6.x-3.0-beta2
http://drupal.org/node/1820478
apachesolr_og 6.x-3.0 and 7.x-1.0
http://drupal.org/project/apachesolr_og
apachesolr 6.x-3.0-rc1
http://drupal.org/project/apachesolr
Comment #41
drummI merged facetapi 6.x-3.0-beta2 and apachesolr 6.x-3.0-rc1 to drupal.org and groups.drupal.org. And apachesolr_og 6.x-3.0 to groups only.
Comment #42
drumm#1819542: D7 Upgrade QA Bug: Search - The link to first result in the solr search results page is wrong is a blocker.
Comment #42.0
drummUpdated issue summary to include latest details regarding gdo deployment.
Comment #43
drummI trimmed the deployment instructions and checked them on staging.
Comment #44
drummMore settings to copy over.
Comment #45
drummDeployed and 8% reindexed.
Comment #46
Nick_vhGreat work all!
Comment #47
drummIndexing live is done and took 11 hours.
Comment #48.0
(not verified) CreditAttribution: commentedUpdate for live