AMP-30971: Thread issues when updating #4402

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

Open

brianbrix wants to merge 32 commits into develop from fix/AMP-30971-/mport-activities

Jenkinsfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ stage('Build') { @@
             println "AMP Version: ${codeVersion}"
             //Used in the initial generation of keys when working with a new jenkins instance
             //****************************************************************
-    //        sh "ssh-keygen -t rsa -b 4096 -C 'jenkins@${environment}' -f ~/.ssh/id_rsa -N ''"
+    //        sh "ssh-keygen -t rsa -b 4096 -C '${env.jenkinsUser}@${environment}' -f ~/.ssh/id_rsa -N ''"
             sh "ssh-keyscan -H ${environment} >> ~/.ssh/known_hosts"
     //        sh "cat /root/.ssh/id_rsa.pub"
             //******************************************************
@@ Expand Down @@

amp/src/main/java/org/dgfoundation/amp/onepager/HibernateRequestCycleListener.java

-Original file line number
+Diff line change
@@ -0,0 +1,89 @@
+    package org.dgfoundation.amp.onepager;
+    import org.apache.wicket.request.IRequestHandler;
+    import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
+    import org.apache.wicket.request.cycle.RequestCycle;
+    import org.digijava.kernel.persistence.PersistenceManager;
+    import org.hibernate.Session;
+    import org.hibernate.Transaction;
+    /**
+     * Wicket request cycle listener that manages Hibernate session lifecycle
+     * for each web request.
+     */
+    public class HibernateRequestCycleListener extends AbstractRequestCycleListener {
+        private static final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(HibernateRequestCycleListener.class);
+        @Override
+        public void onBeginRequest(RequestCycle cycle) {
+            if (PersistenceManager.isSessionManaged()) {
+                logger.warn("Session already exists when starting new request - possible nesting issue");
+                return;
+            }
+            try {
+                Session session = PersistenceManager.getSession();
+                if (!session.getTransaction().isActive()) {
+                    session.beginTransaction();
+                }
+                logger.debug("Started new session and transaction for request");
+            } catch (Exception e) {
+                logger.error("Failed to start Hibernate session for request", e);
+                throw new RuntimeException("Failed to initialize Hibernate session", e);
+            }
+        }
+        @Override
+        public void onEndRequest(RequestCycle cycle) {
+            try {
+                Session session = PersistenceManager.getSession();
+                if (session == null || !session.isOpen()) {
+                    logger.debug("No active session to close at end of request");
+                    return;
+                }
+                Transaction transaction = session.getTransaction();
+                try {
+                    if (transaction.isActive()) {
+                        if (transaction.getStatus().canRollback()) {
+                            transaction.commit();
+                            logger.debug("Successfully committed transaction");
+                        } else {
+                            logger.warn("Transaction in unexpected state: " + transaction.getStatus());
+                        }
+                    }
+                } catch (Exception e) {
+                    logger.error("Error during transaction commit - attempting rollback", e);
+                    try {
+                        if (transaction.isActive()) {
+                            transaction.rollback();
+                            logger.debug("Rolled back transaction after error");
+                        }
+                    } catch (Exception rollbackEx) {
+                        logger.error("Failed to rollback transaction", rollbackEx);
+                    }
+                    throw new RuntimeException("Failed to commit transaction", e);
+                }
+            } finally {
+                try {
+                    PersistenceManager.cleanupThread();
+                    logger.debug("Cleaned up thread resources");
+                } catch (Exception e) {
+                    logger.error("Error during thread cleanup", e);
+                }
+            }
+        }
+        @Override
+        public void onDetach(RequestCycle cycle) {
+            // Ensure cleanup even if request processing fails
+            PersistenceManager.cleanupThread();
+        }
+        @Override
+        public IRequestHandler onException(RequestCycle cycle, Exception ex) {
+            logger.error("Exception occurred during request processing - cleaning up session", ex);
+            PersistenceManager.cleanupThread();
+            return null;
+        }
+    }

amp/src/main/java/org/dgfoundation/amp/onepager/OnePagerApp.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -69,6 +69,7 @@ public void init() { @@
                 WicketSource.configure(this);
                 IS_DEVELOPMENT_MODE = true;
             }
+            getRequestCycleListeners().add(new HibernateRequestCycleListener());
             //getResourceSettings().setStripJavaScriptCommentsAndWhitespace(true);
             //getResourceSettings().setAddLastModifiedTimeToResourceReferenceUrl(true);
@@ Expand Down @@

amp/src/main/java/org/dgfoundation/amp/onepager/models/AmpActivityModel.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ public void beginConversation(boolean reset) { @@
          * @return
          */
         public static Session getHibernateSession(){
-            return getHibernateSession(false);
+            return PersistenceManager.getSession();
         }
         private static Session getHibernateSession(boolean reset) {
@@ Expand Down @@

amp/src/main/java/org/dgfoundation/amp/onepager/util/ActivityUtil.java

-Original file line number
+Diff line change
@@ Expand Up @@
          * saves a new version of an activity
          * returns newActivity
          */
         public static AmpActivityVersion saveActivityNewVersion(AmpActivityVersion a,
                                                                 Collection<AmpContentTranslation> translations, List<AmpContentTranslation> cumulativeTranslations,
                                                                 AmpTeamMember ampCurrentMember, boolean draft,
@@ Expand Down Expand Up @@
                     }
                     session.flush();
+                    session.clear();
                 } catch (CloneNotSupportedException e) {
                     logger.error("Can't clone current Activity: ", e);
@@ Expand Down Expand Up @@
                 session.merge(a);
             }
             session.flush();
+            session.clear();
             updatePerformanceRules(oldA, a);
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AMP-30971: Thread issues when updating #4402

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

AMP-30971: Thread issues when updating #4402

Are you sure you want to change the base?

Uh oh!

AMP-30971: Thread issues when updating #4402

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!