Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 28 #29

Merged
merged 4 commits into from
Aug 10, 2017
Merged

Issue 28 #29

merged 4 commits into from
Aug 10, 2017

Conversation

lutaylor
Copy link
Contributor

@lutaylor lutaylor commented Jun 1, 2017

JIRA Ticket: #28 (no JIRA just issue in queue)

What does this Pull Request do?

Updates Fits to 1.1.0
Solr to 4.10.4
GSEARCH HEAD
gsearch_extensions 0.1.2

Some of the pathing has been updated to avoid having to change any files in basic-solr-config it should just work as is. No longer pulling pre-built GSEARCH configs from the York server since they wouldn't work after the updates. The ant process will now run when box is cut.

What's new?

Updated Fits, Solr, Gsearch, and Gsearch extensions. Also added log4j that will log gsearch errors to /usr/local/fedora/server/logs/fedoragsearch.log.

How should this be tested?

Clone my repo. Bring up islandora_vagrant_base_box then halt and package. After packaging add the package.box

vagrant box add testbox package.box

Then update config.vm.box = "testbox" in the islandora_vagrant Vagrantfile.

Then in islandora_vagrant

vagrant up

Try to ingest, modify and delete objects. Ensure that Solr is updating as expected.

Additional Notes:

Note: Drupal, PHP and other binaries will be updated when the new basebox is cut. Tomcat is currently installing from latest from Ubuntu repositories. Pulling it out to install from source is going to be a lot more work than first anticipated and should be handled under a seperate issue/PR if we feel that it is still necessary. Gsearch has been updated so it should be compatible with latest Tomcat when update takes place.

Interested parties

@DonRichards
@Natkeeran

@lutaylor
Copy link
Contributor Author

lutaylor commented Jun 1, 2017

Updated to FITS 1.1.1 as per @ruebot comment.

@DonRichards
Copy link
Member

I'm little confused @lutaylor. Why vagrant box add testbox package.box ?

@lutaylor
Copy link
Contributor Author

@DonRichards
I added a seperate box so it wouldn't mess with the existing base box that was downloaded on my system. You don't necessarily have to do this but I figured it was the way to go to avoid possibly pulling the wrong box but I could be wrong.

@lutaylor
Copy link
Contributor Author

@DonRichards

We will also need this one done and a new basebox cut to be compatible.

@lutaylor
Copy link
Contributor Author

lutaylor commented Aug 7, 2017

@DonRichards
Did you need anything from me to help get this merged/tested?

Copy link
Contributor

@DiegoPino DiegoPino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Solr home inside fedora's ?


SOLR_HOME="/usr/local/solr"
SOLR_VERSION=4.2.0
SOLR_HOME="/usr/local/fedora/solr"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey People, why did you change the Solr home directory? Being it inside fedora is a bit confusing. Are there any strict devops requirements for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was to be compatible with the basic-solr-configs https://github.com/discoverygarden/basic-solr-config/blob/4.10.x/index.properties#L18. Changed it to avoid having to sed/modify the original configs. It can exist anywhere really, no hard set reason to have it in /usr/local/fedora/solr. The basic-solr-configs have it set like that for legacy reasons. If it is an issue I can change it back to the previous location and just sed the configs after cloning.

Copy link
Contributor

@DiegoPino DiegoPino Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lutaylor I get it, those properties are set for the build in Solr. I would suggest you go for sed. It's good practice for people poking around in the machine to have the different services in their own directories, but mostly in the same place, they were available a few months ago (past if this gets merged).

<appender-ref ref="FILEOUT"/>
</logger>

<logger name="dk.defxws.fgssolr" additivity="false">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this gsearch 2.8? If so, we could add the extra solr remote log handler in case someone wants the internal one swapped and wonders why logs are not working ?

<logger name="dk.defxws.fgssolrremote" additivity="false">
<level value="LOGLEVEL" />
<appender-ref ref="FILEOUT"/>
</logger>````

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This look good?
lutaylor@65ae56a

Gsearch_extensions were updated since I put the main PR in so I had to update the version number.

Also see Islandora-Labs/islandora_vagrant#128 updated to match.

@DiegoPino
Copy link
Contributor

@lutaylor++ looks good, thanks for addressing my concerns.

@lutaylor
Copy link
Contributor Author

lutaylor commented Aug 9, 2017

@Islandora-Labs/committers
Anyone willing to Merge?

@DiegoPino
Copy link
Contributor

@lutaylor if you are ok with that, I can merge. Was giving DevOps IG folks preference.

@lutaylor
Copy link
Contributor Author

lutaylor commented Aug 9, 2017

@DiegoPino
Sure that would be great. Unless someone else wants to chime in.

We still need someone with access to the Hashicorp account to publish the new basebox once this and the other PR gets merged. I do not have access.
@manez Do you have access? I think you and @ruebot were the only ones?

@ruebot
Copy link
Contributor

ruebot commented Aug 9, 2017

@lutaylor - @manez can get you the credentials. if you need hand with hashicorp, let me know and I'll hop into irc.

@lutaylor
Copy link
Contributor Author

Thanks, @ruebot I will connect with @manez and let you know if I need help.

@DiegoPino

Sure go ahead and merge if you are able. Thank you for your help!

@DiegoPino DiegoPino merged commit af2984c into Islandora-Labs:master Aug 10, 2017
DiegoPino pushed a commit to Islandora-Labs/islandora_vagrant that referenced this pull request Aug 10, 2017
@lutaylor
Copy link
Contributor Author

@ruebot Sent you an email with a few questions whenever you get a moment.

@lutaylor
Copy link
Contributor Author

The new basebox has been published. Confirmed that I can delete/add solr objects fine. Please let me know if you find any issues.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants