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.

Sign up for GitHub

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

Jump to bottom

Performance test data #1106

Merged
merged 6 commits into from Apr 11, 2019
Merged

Performance test data #1106

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4378ab2
generate performance test data
luontola Apr 10, 2019
425a35e
don't generate performance test data for basic integration tests
luontola Apr 10, 2019
f758318
cache events and projection: request time 14s -> 13s
luontola Apr 10, 2019
b58aafc
cache injections per request: request time 13s -> 3s
luontola Apr 10, 2019
5a363c1
add missing require and use ns alias to not repeat the mistake
luontola Apr 11, 2019
ba0c3ee
refactor
luontola Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 20 additions & 6 deletions src/clj/rems/api/applications_v2.clj
View file
Open in desktop
@@ -1,5 +1,8 @@
(ns rems.api.applications-v2
(:require [rems.application.model :as model]
(:require [clojure.tools.logging :as log]
[medley.core :refer [map-vals]]
[mount.core :as mount]
[rems.application.model :as model]
[rems.auth.util :refer [throw-forbidden]]
[rems.db.applications :as applications]
[rems.db.catalogue :as catalogue]
Expand Down Expand Up @@ -65,15 +68,26 @@
:application/form
:application/licenses))

(mount/defstate all-applications-cache
:start (atom {:last-processed-event-id 0
:applications nil}))
Copy link
Contributor

@opqdonut opqdonut Apr 10, 2019 •
edited

Choose a reason for hiding this comment

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

core.cache has nice functional caches with various startegies... would they be applicable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The events are immutable and the injections are not yet cached in state, so for now an atom is enough. I'll keep core.cache in mind when doing further optimizations.


(defn get-all-applications [user-id]
;; TODO: cache the applications and build the projection incrementally as new events are published
(let [events (applications/get-dynamic-application-events-since 0)
applications (reduce all-applications-view nil events)]
(let [cache @all-applications-cache
events (applications/get-dynamic-application-events-since (:last-processed-event-id cache))
applications (reduce all-applications-view (:applications cache) events)
;; TODO: for a shared cache it may be necessary to make assoc-injections idempotent and consider cache invalidation
cached-injections (map-vals memoize injections)]
(when-let [event-id (:event/id (last events))]
(when (compare-and-set! all-applications-cache
cache
{:last-processed-event-id event-id
:applications applications})
(log/info "Updated all-applications-cache from" (:last-processed-event-id cache) "to" event-id)))
(->> (vals applications)
(map #(model/apply-user-permissions % user-id))
(remove nil?)
;; TODO: for caching it may be necessary to make assoc-injections idempotent and consider cache invalidation
(map #(model/enrich-with-injections % injections))
(map #(model/enrich-with-injections % cached-injections))
(map exclude-unnecessary-keys-from-overview))))

(defn- own-application? [application]
Expand Down
7 changes: 4 additions & 3 deletions src/clj/rems/auth/fake_shibboleth.clj
View file
Open in desktop
@@ -1,12 +1,12 @@
(ns rems.auth.fake-shibboleth
(:require [compojure.core :refer [GET defroutes]]
(:require [clojure.string :as str]
[compojure.core :refer [GET defroutes]]
[hiccup.page :refer [html5]]
[hiccup.util :refer [url]]
[rems.db.core :as db]
[rems.db.test-data :refer [+fake-user-data+]]
[rems.json :as json]
[ring.util.response :refer [content-type redirect
response]]))
[ring.util.response :refer [content-type redirect response]]))

(def ^{:private true
:doc "Inlined CSS declaration for fake login."}
Expand Down Expand Up @@ -63,6 +63,7 @@ a:visited { color: #fff; }
[:div.login
[:h1 "Development Login"]
[:div.users (->> (map :userid (db/get-users))
(remove #(str/starts-with? % "perftester"))
(sort)
(distinct)
(map user-selection))]]])
Expand Down
90 changes: 89 additions & 1 deletion src/clj/rems/db/test_data.clj
View file
Open in desktop
Expand Up @@ -6,13 +6,16 @@
[rems.db.catalogue :as catalogue]
[rems.db.core :as db]
[rems.db.form :as form]
[rems.db.licenses :as licenses]
[rems.db.resource :as resource]
[rems.db.roles :as roles]
[rems.db.users :as users]
[rems.db.workflow :as workflow]
[rems.db.workflow-actors :as actors]
[rems.locales :as locales]
[ring.util.http-response :refer [bad-request!]])
(:import (org.joda.time DateTimeUtils DateTime)))
(:import [java.util UUID]
[org.joda.time DateTimeUtils DateTime]))

(def ^DateTime creation-time (time/now)) ; TODO: no more used, remove?

Expand Down Expand Up @@ -628,6 +631,91 @@
(let [application (create-draft! applicant item-without-new-license wfid "applied before license was valid" (time/minus (time/now) (time/days 2)))]
(applications/submit-application applicant application)))))

(defn create-performance-test-data! []
(let [resource-count 1000
application-count 1000
user-count 1000
handlers [(+fake-users+ :approver1)
(+fake-users+ :approver2)]
owner (+fake-users+ :owner)
workflow-id (:id (workflow/create-workflow! {:user-id owner
:organization "perf"
:title "Performance tests"
:type :dynamic
:handlers handlers}))
form-id (:id (form/create-form!
owner
{:organization "perf"
:title "Performance tests"
:items [{:title {:en "Project name"
:fi "Projektin nimi"}
:optional false
:type "description"
:input-prompt {:en "Project"
:fi "Projekti"}}

{:title {:en "Project description"
:fi "Projektin kuvaus"}
:optional false
:type "texta"
:input-prompt {:en "The purpose of the project is to..."
:fi "Projektin tarkoitus on..."}}]}))
form (form/get-form form-id)
license-id (:id (licenses/create-license!
{:licensetype "text"
:title "Performance License"
:textcontent "Be fast."
:localizations {:en {:title "Performance license"
:textcontent "Be fast."}
:fi {:title "Suorituskykylisenssi"
:textcontent "Ole nopea."}}}
owner))
cat-item-ids (vec (for [_ (range resource-count)]
(let [uuid (UUID/randomUUID)
resource (resource/create-resource!
{:resid (str "urn:uuid:" uuid)
:organization "perf"
:licenses [license-id]}
owner)
_ (assert (:success resource))
cat-item (catalogue/create-catalogue-item! {:title (str "Performance test resource " uuid)
:form form-id
:resid (:id resource)
:wfid workflow-id})]
(:id cat-item))))
user-ids (vec (for [n (map inc (range user-count))]
luontola marked this conversation as resolved.
Show resolved Hide resolved
(let [user-id (str "perftester" n)]
(users/add-user! user-id {:eppn user-id
:mail (str user-id "@example.com")
:commonName (str "Performance Tester " n)})
user-id)))]
(doseq [_ (range application-count)]
luontola marked this conversation as resolved.
Show resolved Hide resolved
(let [cat-item-id (rand-nth cat-item-ids)
user-id (rand-nth user-ids)
handler (rand-nth handlers)
app-id (:application-id (applications/create-application! user-id [cat-item-id]))]
(assert (nil? (applications/command!
{:type :application.command/save-draft
:actor user-id
:time (time/now)
:application-id app-id
:field-values [{:field (:id (first (:fields form)))
:value (str "Performance test application " (UUID/randomUUID))}
{:field (:id (second (:fields form)))
;; 5000 bytes of lorem ipsum
:value "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non diam vel erat dapibus facilisis vel vitae nunc. Curabitur at fermentum lorem. Cras et bibendum ante. Etiam convallis erat justo. Phasellus cursus molestie vehicula. Etiam molestie tellus vitae consectetur dignissim. Pellentesque euismod hendrerit mi sed tincidunt. Integer quis lorem ut ipsum egestas hendrerit. Aenean est nunc, mattis euismod erat in, sodales rutrum mauris. Praesent sit amet risus quis felis congue ultricies. Nulla facilisi. Sed mollis justo id tristique volutpat.\n\nPhasellus augue mi, facilisis ac velit et, pharetra tristique nunc. Pellentesque eget arcu quam. Curabitur dictum nulla varius hendrerit varius. Proin vulputate, ex lacinia commodo varius, ipsum velit viverra est, eget molestie dui nisi non eros. Nulla lobortis odio a magna mollis placerat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Integer consectetur libero ut gravida ullamcorper. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec aliquam feugiat mollis. Quisque massa lacus, efficitur vel justo vel, elementum mollis magna. Maecenas at sem sem. Praesent sed ex mattis, egestas dui non, volutpat lorem. Nulla tempor, nisi rutrum accumsan varius, tellus elit faucibus nulla, vel mattis lacus justo at ante. Sed ut mollis ex, sed tincidunt ex.\n\nMauris laoreet nibh eget erat tincidunt pharetra. Aenean sagittis maximus consectetur. Curabitur interdum nibh sed tincidunt finibus. Sed blandit nec lorem at iaculis. Morbi non augue nec tortor hendrerit mollis ut non arcu. Suspendisse maximus nec ligula a efficitur. Etiam ultrices rhoncus leo quis dapibus. Integer vel rhoncus est. Integer blandit varius auctor. Vestibulum suscipit suscipit risus, sit amet venenatis lacus iaculis a. Duis eu turpis sit amet nibh sagittis convallis at quis ligula. Sed eget justo quis risus iaculis lacinia vitae a justo. In hac habitasse platea dictumst. Maecenas euismod et lorem vel viverra.\n\nDonec bibendum nec ipsum in volutpat. Vivamus in elit venenatis, venenatis libero ac, ultrices dolor. Morbi quis odio in neque consequat rutrum. Suspendisse quis sapien id sapien fermentum dignissim. Nam eu est vel risus volutpat mollis sed quis eros. Proin leo nulla, dictum id hendrerit vitae, scelerisque in elit. Proin consectetur sodales arcu ac tristique. Suspendisse ut elementum ligula, at rhoncus mauris. Aliquam lacinia at diam eget mattis. Phasellus quam leo, hendrerit sit amet mi eget, porttitor aliquet velit. Proin turpis ante, consequat in enim nec, tempus consequat magna. Vestibulum fringilla ac turpis nec malesuada. Proin id lectus iaculis, suscipit erat at, volutpat turpis. In quis faucibus elit, ut maximus nibh. Sed egestas egestas dolor.\n\nNulla varius orci quam, id auctor enim ultrices nec. Morbi et tellus ac metus sodales convallis sed vehicula neque. Pellentesque rhoncus mattis massa a bibendum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce tincidunt nulla non aliquet facilisis. Praesent nisl nisi, finibus id odio sed, consectetur feugiat mauris. Suspendisse sed lacinia ligula. Duis vitae nisl leo. Donec erat arcu, feugiat sit amet sagittis ac, scelerisque nec est. Pellentesque finibus mauris nulla, in maximus sapien pharetra vitae. Sed leo elit, consequat eu aliquam vitae, feugiat ut eros. Pellentesque dictum feugiat odio sed commodo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin neque quam, varius vel libero sit amet, rhoncus sollicitudin ex. In a dui non neque malesuada pellentesque.\n\nProin tincidunt nisl non commodo faucibus. Sed porttitor arcu neque, vitae bibendum sapien placerat nec. Integer eget tristique orci. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec eu molestie eros. Nunc iaculis rhoncus enim, vel mattis felis fringilla condimentum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Aenean ac augue nulla. Phasellus vitae nulla lobortis, mattis magna ac, gravida ipsum. Aenean ornare non nunc non luctus. Aenean lacinia lectus nec velit finibus egestas vel ut ipsum. Cras hendrerit rhoncus erat, vel maximus nunc.\n\nPraesent quis imperdiet quam. Praesent ligula tellus, consectetur sed lacus eu, malesuada condimentum tellus. Donec et diam hendrerit, dictum diam quis, aliquet purus. Suspendisse pulvinar neque at efficitur iaculis. Nulla erat orci, euismod id velit sed, dictum hendrerit arcu. Nulla aliquam molestie aliquam. Duis et semper nisi, eget commodo arcu. Praesent rhoncus, nulla id sodales eleifend, ante ipsum pellentesque augue, id iaculis sem est vitae est. Phasellus cursus diam a lorem vestibulum sodales. Nullam lacinia tortor vel tellus commodo, sit amet sodales quam malesuada.\n\nNulla tempor lectus vel arcu feugiat, vel dapibus ex dapibus. Maecenas purus justo, aliquet et sem sit amet, tincidunt venenatis dui. Nulla eget purus id sapien elementum rutrum eu vel libero. Cras non accumsan justo posuere."}]})))
opqdonut marked this conversation as resolved.
Show resolved Hide resolved
(assert (nil? (applications/command!
{:type :application.command/submit
:actor user-id
:time (time/now)
:application-id app-id})))
(assert (nil? (applications/command!
{:type :application.command/approve
:actor handler
:time (time/now)
:application-id app-id
:comment "Looks fine."})))))))

(defn create-test-data! []
(DateTimeUtils/setCurrentMillisFixed (.getMillis creation-time))
(try
Expand Down
3 changes: 3 additions & 0 deletions src/clj/rems/db/workflow.clj
View file
Open in desktop
Expand Up @@ -34,6 +34,9 @@

(defn- create-dynamic-workflow! [{:keys [user-id organization title handlers]}]
(assert user-id)
(assert organization)
(assert title)
(assert (every? string? handlers) {:handlers handlers})
(let [wfid (:id (db/create-workflow! {:organization organization,
:owneruserid user-id,
:modifieruserid user-id,
Expand Down
3 changes: 2 additions & 1 deletion src/clj/rems/standalone.clj
View file
Open in desktop
Expand Up @@ -91,7 +91,8 @@
(= "test-data" (first args))
(do
(mount/start #'rems.config/env #'rems.db.core/*db*)
(test-data/create-test-data!))
(test-data/create-test-data!)
(test-data/create-performance-test-data!))
(= "demo-data" (first args))
(do
(mount/start #'rems.config/env #'rems.db.core/*db*)
Expand Down
5 changes: 3 additions & 2 deletions test/clj/rems/api/test_entitlements.clj
View file
Open in desktop
@@ -1,8 +1,9 @@
(ns ^:integration rems.api.test-entitlements
(:require [clojure.test :refer :all]
[rems.handler :refer [handler]]
[rems.api.testing :refer :all]
[rems.db.users :as users]
[rems.handler :refer [handler]]
[rems.poller.entitlements :as entitlements-poller]
[ring.mock.request :refer :all]))

(use-fixtures
Expand All @@ -17,7 +18,7 @@
(is (= "unauthorized" body)))))

(deftest entitlements-test
(rems.poller.entitlements/run)
(entitlements-poller/run)
(let [api-key "42"]
(testing "all"
(let [data (-> (request :get "/api/entitlements")
Expand Down
19 changes: 10 additions & 9 deletions test/clj/rems/db/test_entitlements.clj
View file
Open in desktop
Expand Up @@ -2,12 +2,13 @@
(:require [cheshire.core :as cheshire]
[clj-time.core :as time]
[clojure.test :refer :all]
[rems.db.core :as db]
[rems.db.applications :as applications]
[rems.db.core :as db]
[rems.db.entitlements :as entitlements]
[rems.db.licenses :as licenses]
[rems.db.resource :as resource]
[rems.db.testing :refer [test-db-fixture rollback-db-fixture test-data-fixture]]
[rems.poller.entitlements :as entitlements-poller]
[rems.testing-util :refer [suppress-logging]]
[stub-http.core :as stub]))

Expand Down Expand Up @@ -69,7 +70,7 @@
(is (= +expected-payload+ (cheshire/parse-string payload)))))))))

(deftest test-entitlement-granting
(rems.poller.entitlements/run) ; clear previous entitlements
(entitlements-poller/run) ; clear previous entitlements
(with-open [server (stub/start! {"/add" {:status 200}
"/remove" {:status 200}})]
(with-redefs [rems.config/env {:entitlements-target
Expand Down Expand Up @@ -110,7 +111,7 @@
:member {:userid memberid}
:time (time/now)})))
(testing "submitted application should not yet cause entitlements"
(rems.poller.entitlements/run)
(entitlements-poller/run)
(is (empty? (db/get-entitlements {:application app-id})))
(is (empty? (stub/recorded-requests server))))

Expand All @@ -121,7 +122,7 @@
:time (time/now)})))

(testing "approved application should not yet cause entitlements"
(rems.poller.entitlements/run)
(entitlements-poller/run)
(is (empty? (db/get-entitlements {:application app-id})))
(is (empty? (stub/recorded-requests server))))

Expand All @@ -142,8 +143,8 @@
(:application/accepted-licenses (applications/get-application-state app-id))))

(testing "approved application, licenses accepted by one user generates entitlements for that user"
(rems.poller.entitlements/run)
(rems.poller.entitlements/run) ;; run twice to check idempotence
(entitlements-poller/run)
(entitlements-poller/run) ;; run twice to check idempotence
(is (= 2 (count (stub/recorded-requests server))))
(testing "db"
(is (= [[uid "resource1"] [uid "resource2"]]
Expand All @@ -167,7 +168,7 @@
:time (time/now)})))

(testing "approved application, more accepted licenses generates more entitlements"
(rems.poller.entitlements/run)
(entitlements-poller/run)
(is (= 4 (count (stub/recorded-requests server))))
(testing "db"
(is (= [[uid "resource1"] [uid "resource2"]
Expand All @@ -193,7 +194,7 @@
:time (time/now)})))

(testing "removing a member ends entitlements"
(rems.poller.entitlements/run)
(entitlements-poller/run)
(is (= 5 (count (stub/recorded-requests server))))
(testing "db"
(is (= [[uid "resource1"] [uid "resource2"]]
Expand All @@ -214,7 +215,7 @@
:time (time/now)})))

(testing "closed application should end entitlements"
(rems.poller.entitlements/run)
(entitlements-poller/run)
(is (= 6 (count (stub/recorded-requests server))))
(testing "db"
(is (= []
Expand Down
3 changes: 2 additions & 1 deletion test/clj/rems/db/testing.clj
View file
Open in desktop
Expand Up @@ -11,7 +11,8 @@
(mount/stop) ;; during interactive development, app might be running when tests start. we need to tear it down
(mount/start-with-args {:test true}
#'rems.config/env
#'rems.db.core/*db*)
#'rems.db.core/*db*
#'rems.api.applications-v2/all-applications-cache)
(db/assert-test-database!)
(migrations/migrate ["reset"] {:database-url (:test-database-url env)})
(f)
Expand Down
1 change: 1 addition & 0 deletions test/clj/rems/test_browser.clj
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@
(mount/start)
(migrations/migrate ["reset"] (select-keys rems.config/env [:database-url]))
(test-data/create-test-data!)
(test-data/create-performance-test-data!)
(f)
(mount/stop))

Expand Down