From cc74378f1512fd4e9a214689bb940e3fb18f03f1 Mon Sep 17 00:00:00 2001 From: Gustavo Durand Date: Thu, 31 Aug 2023 11:40:31 -0400 Subject: [PATCH 1/7] Update file-download-button-fragment.xhtml --- .../webapp/file-download-button-fragment.xhtml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml index 4021ad7bc65..756b23d1822 100644 --- a/src/main/webapp/file-download-button-fragment.xhtml +++ b/src/main/webapp/file-download-button-fragment.xhtml @@ -74,7 +74,7 @@ styleClass="btn-download" process="@this" disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" - action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'GlobusTransfer')}" + actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'GlobusTransfer')}" update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');"> @@ -101,7 +101,7 @@ styleClass="btn-download" process="@this" disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" - action="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}" + actionListener="#{guestbookResponseService.modifyDatafileAndFormat(guestbookResponse, fileMetadata, 'package')}" update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');"> @@ -123,7 +123,7 @@ styleClass="btn-download" process="@this" disabled="#{(fileMetadata.dataFile.ingestInProgress or lockedFromDownload) ? 'disabled' : ''}" - action="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}" + actionListener="#{guestbookResponseService.modifyDatafile(guestbookResponse, fileMetadata)}" update="@widgetVar(downloadPopup)" oncomplete="PF('downloadPopup').show();handleResizeDialog('downloadPopup');"> @@ -161,7 +161,7 @@ @@ -178,7 +178,7 @@ #{bundle['file.downloadBtn.format.tab']} @@ -197,7 +197,7 @@ @@ -224,7 +224,7 @@ #{bundle['file.downloadBtn.format.var']} @@ -340,7 +340,7 @@ Date: Thu, 31 Aug 2023 11:48:39 -0400 Subject: [PATCH 2/7] Update file-download-button-fragment.xhtml --- src/main/webapp/file-download-button-fragment.xhtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml index 756b23d1822..f28efc47705 100644 --- a/src/main/webapp/file-download-button-fragment.xhtml +++ b/src/main/webapp/file-download-button-fragment.xhtml @@ -141,7 +141,7 @@ #{bundle['file.downloadBtn.format.all']} @@ -311,7 +311,7 @@ Date: Thu, 31 Aug 2023 11:56:24 -0400 Subject: [PATCH 3/7] #9865 correct Solr 9.3.0 download link --- doc/release-notes/9260-solr930.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/9260-solr930.md b/doc/release-notes/9260-solr930.md index d4d9adca61c..ad6775ad7fb 100644 --- a/doc/release-notes/9260-solr930.md +++ b/doc/release-notes/9260-solr930.md @@ -11,7 +11,7 @@ We assume that you already have a user called "solr" (from the instructions abov ``` su - solr cd /usr/local/solr - wget https://archive.apache.org/dist/lucene/solr/9.3.0/solr-9.3.0.tgz + wget https://archive.apache.org/dist/solr/solr/9.3.0/solr-9.3.0.tgz tar xvzf solr-9.3.0.tgz cd solr-9.3.0 cp -r server/solr/configsets/_default server/solr/collection1 From a6d4a35dec8ea3144bf3dbe9bcbe150253669a19 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Thu, 31 Aug 2023 12:03:30 -0400 Subject: [PATCH 4/7] #9866 mention requestHeaderSize increase --- doc/release-notes/9260-solr930.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/release-notes/9260-solr930.md b/doc/release-notes/9260-solr930.md index d4d9adca61c..6a4d89dfb01 100644 --- a/doc/release-notes/9260-solr930.md +++ b/doc/release-notes/9260-solr930.md @@ -25,6 +25,10 @@ We assume that you already have a user called "solr" (from the instructions abov cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-9.3.0/server/solr/collection1/conf ``` +1. A Dataverse installation requires a change to the jetty.xml file that ships with Solr. + + Edit /usr/local/solr/solr-9.3.0/server/etc/jetty.xml , increasing `requestHeaderSize` from `8192` to `102400` + 1. Tell Solr to create the core "collection1" on startup. ``` From ea333c91d5bb6950ae4deee37028abee26ef1308 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 1 Sep 2023 09:52:43 -0400 Subject: [PATCH 5/7] disable loading of metadata blocks in API tests #9868 Disabled because once there are new fields in the database that Solr doesn't know about, dataset creation could be prevented, or at least subsequent search operations could fail because the dataset can't be indexed. --- .../java/edu/harvard/iq/dataverse/api/AdminIT.java | 14 ++++++++++++++ .../java/edu/harvard/iq/dataverse/api/UtilIT.java | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java index 2aee3bd38b2..a5a4924ad77 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java @@ -734,6 +734,13 @@ public void testMigrateHDLToDOI() { .statusCode(OK.getStatusCode()); } + /** + * Disabled because once there are new fields in the database that Solr + * doesn't know about, dataset creation could be prevented, or at least + * subsequent search operations could fail because the dataset can't be + * indexed. + */ + @Disabled @Test public void testLoadMetadataBlock_NoErrorPath() { Response createUser = UtilIT.createRandomUser(); @@ -778,6 +785,13 @@ public void testLoadMetadataBlock_NoErrorPath() { assertEquals(244, (int) statistics.get("Controlled Vocabulary")); } + /** + * Disabled because once there are new fields in the database that Solr + * doesn't know about, dataset creation could be prevented, or at least + * subsequent search operations could fail because the dataset can't be + * indexed. + */ + @Disabled @Test public void testLoadMetadataBlock_ErrorHandling() { Response createUser = UtilIT.createRandomUser(); diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java index 0e3998f48a6..e47971f9b92 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java @@ -563,7 +563,14 @@ static Response updateDatasetPIDMetadata(String persistentId, String apiToken) .post("/api/datasets/:persistentId/modifyRegistrationMetadata/?persistentId=" + persistentId); return response; } - + + /** + * Deprecated because once there are new fields in the database that Solr + * doesn't know about, dataset creation could be prevented, or at least + * subsequent search operations could fail because the dataset can't be + * indexed. + */ + @Deprecated static Response loadMetadataBlock(String apiToken, byte[] body) { return given() .header(API_TOKEN_HTTP_HEADER, apiToken) From 74dc41d5e4a6e56801bea1a1f5b38434f39b7e9f Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Fri, 1 Sep 2023 10:51:13 -0400 Subject: [PATCH 6/7] bump com.google.guava to current version 32.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ff313743d5..b6aaedf0586 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ com.google.guava guava - 29.0-jre + 32.1.2-jre jar From 4139f70c84ab279a3eec2d31db862bad825fad66 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 1 Sep 2023 11:29:18 -0400 Subject: [PATCH 7/7] double sleep when testing for links #9868 --- src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java b/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java index d448a46a066..f7135ce7f3b 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/MoveIT.java @@ -300,7 +300,7 @@ public void testMoveLinkedDataset() { .statusCode(OK.getStatusCode()) .body("feed.entry[0].id", CoreMatchers.endsWith(datasetPid)); - UtilIT.sleepForReindex(datasetPid, superuserApiToken, 10); + UtilIT.sleepForReindex(datasetPid, superuserApiToken, 20); Response getLinksAfter = UtilIT.getDatasetLinks(datasetPid, superuserApiToken); getLinksAfter.prettyPrint(); getLinksAfter.then().assertThat()