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 640 #48

Merged
merged 12 commits into from
Nov 22, 2017
Merged

Issue 640 #48

merged 12 commits into from
Nov 22, 2017

Conversation

dannylamb
Copy link
Contributor

GitHub Issue: Part of Islandora/documentation#640

What does this Pull Request do?

Guts islandora-indexing-fcrepo since the heavy lifting is being moved to Milliner. Routing, configuration, and testing are all dramatically simpler.

What's new?

All business logic has been removed, and routes are now pretty simple. Read incoming message, extract what you need, and then post to Milliner.

How should this be tested?

There's an upcoming Islandora-Devops/claw-playbook PR that we'll use to test all the PRs required for Islandora/documentation#640, since it encompasses Alpaca, Crayfish, Crayfish-Commons, the core Islandora module... pretty much all of it.

Interested parties

@Islandora-CLAW/committers

@codecov
Copy link

codecov bot commented Sep 28, 2017

Codecov Report

Merging #48 into master will decrease coverage by 14.43%.
The diff coverage is 95.83%.

Impacted file tree graph

@@              Coverage Diff              @@
##             master      #48       +/-   ##
=============================================
- Coverage     91.74%   77.31%   -14.44%     
+ Complexity       58       16       -42     
=============================================
  Files             8        4        -4     
  Lines           666      119      -547     
  Branches          3        1        -2     
=============================================
- Hits            611       92      -519     
+ Misses           52       26       -26     
+ Partials          3        1        -2
Impacted Files Coverage Δ Complexity Δ
...lpaca/indexing/triplestore/TriplestoreIndexer.java 100% <100%> (ø) 6 <3> (+3) ⬆️
...slandora/alpaca/indexing/fcrepo/FcrepoIndexer.java 86.36% <92.3%> (-12.67%) 4 <3> (-1)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4f3c097...f9e42bd. Read the comment docs.

@whikloj
Copy link
Member

whikloj commented Nov 3, 2017

Copying from islandora-deprecated/claw_vagrant#55 (comment)

@dannylamb The config for the islandora-indexing-triplestore feature indicates a change from one queue to two (https://github.com/Islandora-CLAW/Alpaca/pull/48/files#diff-d6faeeeee8e4b65be5a42765db3ed169) but the broadcaster is still routing to the old queue ( IslandoraBroadcastRecipients=activemq:queue:islandora-indexing-fcrepo-content,activemq:queue:islandora-indexing-triplestore) and I can't see what is supposed to route the messages (based I am guessing on EventType)

@whikloj
Copy link
Member

whikloj commented Nov 6, 2017

Should the Rules in Drupal be updated so that the Create/Update rules broadcast to the activemq:queue:islandora-indexing-triplestore-index and the Delete broadcasts to the activemq:queue:islandora-indexing-triplestore-delete queue?

I think that is probably makes more sense that there is a simple little router that reads from activemq:queue:islandora-indexing-triplestore and directs to the other two routes based on the EventType...but perhaps I am missing something?

@dannylamb
Copy link
Contributor Author

@whikloj Let me check, you're on to something here.

@dannylamb
Copy link
Contributor Author

Looks like there's an inconsistency in naming between blueprint and config files there. I'm installing the JMS feature now to check it out on a fresh box.

@whikloj
Copy link
Member

whikloj commented Nov 6, 2017

So I went into Drupal and changed the queues for the "Broadcast Content Create Event" and "Broadcast Content Update Event" from activemq:queue:islandora-indexing-triplestore to activemq:queue:islandora-indexing-triplestore-index and changed the "Broadcast Content Delete Event" from activemq:queue:islandora-indexing-triplestore to activemq:queue:islandora-indexing-triplestore-delete.

Now the triples appear in the triplestore.

I think you are missing a route to do the sorting.

@dannylamb
Copy link
Contributor Author

@whikloj Sorting?

Let me touch up the rules and re-export them.

@dannylamb
Copy link
Contributor Author

@whikloj ok, I've updated the rules exports on the Islandora PR

Copy link
Member

@whikloj whikloj left a comment

Choose a reason for hiding this comment

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

👍

@whikloj whikloj merged commit 5a6612b into Islandora:master Nov 22, 2017
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.

2 participants