Skip to content

Commit ea667a2

Browse files
committed
tidy docs
1 parent 8c6f580 commit ea667a2

4 files changed

Lines changed: 23 additions & 18 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SHARE/trove (aka SHARtrove, shtrove) is is a service meant to store (meta)data y
88

99
note: this codebase is currently (and historically) rather entangled with [osf.io](https://osf.io), which has its shtrove at https://share.osf.io -- stay tuned for more-reusable open-source libraries and tools for working with (meta)data
1010

11-
see [how-to docs](./how-to/) for help setting up and using various things
11+
see [how-to docs](./how-to/README.md) for help setting up and using various things
1212

1313
see [ARCHITECTURE.md](./ARCHITECTURE.md) for help navigating this codebase
1414

‎how-to/relate-to-osf.md‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,28 +103,36 @@ could be implemented a variety of ways -- if there were multiple trovesearch str
103103
(as there was before settling on trovesearch_denorm), can select a non-default one with
104104
the `indexStrategy` query param)
105105

106-
## OSF-to-shtrove ingestion sequence
106+
## OSF-thru-shtrove ingestion sequence
107107
(slightly simplified)
108108
```mermaid
109109
sequenceDiagram
110-
participant ms as metadata source
110+
box OSF
111+
participant oq as queues (rabbitmq)
112+
participant od as db (postgres)
113+
participant ow as worker (celery)
114+
end
111115
box shtrove
112116
participant ss as web server
113-
participant sd as db
114-
participant sw as worker
115-
participant sq as queues
117+
participant sd as db (postgres)
118+
participant sw as worker (celery)
119+
participant sq as queues (rabbitmq)
116120
participant si as indexer
117-
participant se as elastic
121+
participant se as elasticsearch
118122
end
119-
ms ->> ss: POST /trove/ingest
120-
ss ->> sd: save metadata record
123+
oq -->> ow: receive update task
124+
od <<-->> ow: gather metadata
125+
ow ->> ss: POST /trove/ingest
126+
ss ->> sd: save ResourceIdentifier(s)
127+
ss ->> sd: save Indexcard
128+
ss ->> sd: save ResourceDescription(s)
121129
ss ->> sq: enqueue derive task
122-
ss ->> ow: success!
130+
ss ->> ow: 201 CREATED (success!)
123131
sq -->> sw: receive derive task
124-
sd <<-->> sw: load metadata record
132+
sd <<-->> sw: load ResourceDescription(s)
125133
sw ->> sd: save DerivedIndexcards
126134
sw ->> sq: enqueue indexer message
127-
sq -->> si: bulk receive indexer messages
128-
sd <<-->> si: bulk load metadata
135+
sq -->> si: bulk receive messages
136+
sd <<-->> si: bulk load metadata records
129137
si ->> se: bulk index
130138
```

‎how-to/use-the-admin-site.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# how to use the admin ui
1+
# how to use the admin site
22

33
shtrove has a [django admin site](https://docs.djangoproject.com/en/stable/ref/contrib/admin/)
44
at `/admin/` that can be used for interacting with the database and managing search indexes

‎how-to/wrangle-index-strategies.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ major-version upgrade of elasticsearch) you should instead create a new index st
2525
3. ensure all services are running up-to-date code (in local dev setup, restart `indexer`, `worker`, and `web`)
2626
4. in the [shtrove admin site](./use-the-admin-site.md), use `/admin/search-indexes` to setup and backfill the new current version
2727
5. use the trove api with `indexStrategy` query param (using the full `mystrategy__checksum...` identifier) to test/compare against the prior (default) version
28-
6. when ready to switch over to use the new version by default, use `/admin/search-indexes`:
29-
-
30-
6. when ready to switch over use `/admin/search-indexes` to make the updated "current" the new default for searching with that strategy
31-
7. when ready to delete a prior version, use `/admin/search-indexes`
28+
6. when ready, use `/admin/search-indexes` to make the new version the default for searching and (when really really ready) to delete the prior version
3229

3330
## how to set up a new index strategy
3431
1. add an instance of your `IndexStrategy` subclass to `share.search.index_strategy._AvailableStrategies` with a unique shortname (this should someday be configurable in settings, but is currently hard-coded)

0 commit comments

Comments
 (0)