diff --git a/content/posts/2018-08.md b/content/posts/2018-08.md index 2ef3da915..4ba68fe62 100644 --- a/content/posts/2018-08.md +++ b/content/posts/2018-08.md @@ -211,6 +211,15 @@ Mozilla/5.0 (compatible; MegaIndex.ru/2.0; +http://megaindex.com/crawler) - Finish up reconciling Atmire's pull request for DSpace 5.8 changes with the latest status of our `5_x-prod` branch - I had to do some `git rev-list --reverse --no-merges oldestcommit..newestcommit` and `git cherry-pick -S` hackery to get everything all in order - After building I ran the Atmire schema migrations and forced old migrations, then did the `ant update` -- I tried to build it on DSpace Test, but it seems to still need more RAM to complete (like I experienced last month), so I stopped Tomcat and set `JAVA_OPTS` to 1024m and tried the mvn package again +- I tried to build it on DSpace Test, but it seems to still need more RAM to complete (like I experienced last month), so I stopped Tomcat and set `JAVA_OPTS` to 1024m and tried the `mvn package` again +- Still the `mvn package` takes forever and essentially hangs on processing the xmlui-mirage2 overlay (though after building all the themes) +- I will try to reduce Tomcat memory from 4608m to 4096m and then retry the `mvn package` with 1024m of `JAVA_OPTS` again +- After running the `mvn package` for the third time and waiting an hour, I attached `strace` to the Java process and saw that it was indeed reading XMLUI theme data... so I guess I just need to wait more +- After waiting two hours the maven process completed and installation was successful +- I restarted Tomcat and it seems everything is working well, so I'll merge the pull request and try to schedule the CGSpace upgrade for this coming Sunday, August 26th +- I merged [Atmire's pull request](https://github.com/ilri/DSpace/pull/378) into our `5_x-dspace-5.8` temporary brach and then cherry-picked all the changes from `5_x-prod` since April, 2018 when that temporary branch was created +- As the branch histories are very different I cannot merge the new 5.8 branch into the current `5_x-prod` branch +- Instead, I will archive the current `5_x-prod` DSpace 5.5 branch as `5_x-prod-dspace-5.5` and then hard reset `5_x-prod` based on `5_x-dspace-5.8` +- Unfortunately this will mess up the references in pull requests and issues on GitHub diff --git a/docs/2018-08/index.html b/docs/2018-08/index.html index ce6e63ebe..470307747 100644 --- a/docs/2018-08/index.html +++ b/docs/2018-08/index.html @@ -34,7 +34,7 @@ I ran all system updates on DSpace Test and rebooted it - + @@ -79,9 +79,9 @@ I ran all system updates on DSpace Test and rebooted it "@type": "BlogPosting", "headline": "August, 2018", "url": "https://alanorth.github.io/cgspace-notes/2018-08/", - "wordCount": "1484", + "wordCount": "1686", "datePublished": "2018-08-01T11:52:54+03:00", - "dateModified": "2018-08-19T18:42:55+03:00", + "dateModified": "2018-08-20T13:49:43+03:00", "author": { "@type": "Person", "name": "Alan Orth" @@ -379,7 +379,16 @@ sys 2m20.248s
  • Finish up reconciling Atmire’s pull request for DSpace 5.8 changes with the latest status of our 5_x-prod branch
  • I had to do some git rev-list --reverse --no-merges oldestcommit..newestcommit and git cherry-pick -S hackery to get everything all in order
  • After building I ran the Atmire schema migrations and forced old migrations, then did the ant update
    • -
  • I tried to build it on DSpace Test, but it seems to still need more RAM to complete (like I experienced last month), so I stopped Tomcat and set JAVA_OPTS to 1024m and tried the mvn package again
    • +
  • I tried to build it on DSpace Test, but it seems to still need more RAM to complete (like I experienced last month), so I stopped Tomcat and set JAVA_OPTS to 1024m and tried the mvn package again
    • +
  • Still the mvn package takes forever and essentially hangs on processing the xmlui-mirage2 overlay (though after building all the themes)
    • +
  • I will try to reduce Tomcat memory from 4608m to 4096m and then retry the mvn package with 1024m of JAVA_OPTS again
    • +
  • After running the mvn package for the third time and waiting an hour, I attached strace to the Java process and saw that it was indeed reading XMLUI theme data… so I guess I just need to wait more
    • +
  • After waiting two hours the maven process completed and installation was successful
    • +
  • I restarted Tomcat and it seems everything is working well, so I’ll merge the pull request and try to schedule the CGSpace upgrade for this coming Sunday, August 26th
    • +
  • I merged Atmire’s pull request into our 5_x-dspace-5.8 temporary brach and then cherry-picked all the changes from 5_x-prod since April, 2018 when that temporary branch was created
    • +
  • As the branch histories are very different I cannot merge the new 5.8 branch into the current 5_x-prod branch
    • +
  • Instead, I will archive the current 5_x-prod DSpace 5.5 branch as 5_x-prod-dspace-5.5 and then hard reset 5_x-prod based on 5_x-dspace-5.8
    • +
  • Unfortunately this will mess up the references in pull requests and issues on GitHub
    • diff --git a/docs/sitemap.xml b/docs/sitemap.xml index e77b2f836..90b6739c2 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -4,7 +4,7 @@ https://alanorth.github.io/cgspace-notes/2018-08/ - 2018-08-19T18:42:55+03:00 + 2018-08-20T13:49:43+03:00 @@ -179,7 +179,7 @@ https://alanorth.github.io/cgspace-notes/ - 2018-08-19T18:42:55+03:00 + 2018-08-20T13:49:43+03:00 0 @@ -190,7 +190,7 @@ https://alanorth.github.io/cgspace-notes/tags/notes/ - 2018-08-19T18:42:55+03:00 + 2018-08-20T13:49:43+03:00 0 @@ -202,13 +202,13 @@ https://alanorth.github.io/cgspace-notes/posts/ - 2018-08-19T18:42:55+03:00 + 2018-08-20T13:49:43+03:00 0 https://alanorth.github.io/cgspace-notes/tags/ - 2018-08-19T18:42:55+03:00 + 2018-08-20T13:49:43+03:00 0