January 2010 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r1455 - in jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster: test and 1 other directory.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-01-18 03:39:04 -0500 (Mon, 18 Jan 2010) New Revision: 1455 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/prepare/TestLoadIndexerWriterWithModes.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java Log: EXOJCR-331 : test update Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/prepare/TestLoadIndexerWriterWithModes.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/prepare/TestLoadIndexerWriterWithModes.java 2010-01-17 15:12:24 UTC (rev 1454) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/prepare/TestLoadIndexerWriterWithModes.java 2010-01-18 08:39:04 UTC (rev 1455) @@ -45,7 +45,7 @@ private volatile boolean stop = false; - private int threadCount = 1; + private int threadCount = 20; // private int threadCount = 50; @@ -60,34 +60,42 @@ public void testWrite() throws Exception { - System.out.println("Skip (y/n) :"); - BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); - String line = reader.readLine(); - if (!line.equals("y")) + try { - log.info("Creating threads..."); - for (int i = 0; i < threadCount; i++) + System.out.println("Skip (y/n) :"); + BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); + String line = reader.readLine(); + if (!line.equals("y")) { - // create new thread and start it - new Thread(new WriterTask(i)).start(); - log.info("Thread#" + i + " created and started."); + log.info("Creating threads..."); + for (int i = 0; i < threadCount; i++) + { + // create new thread and start it + new Thread(new WriterTask(i)).start(); + log.info("Thread#" + i + " created and started."); + } + startSignal.countDown(); + // wait 5 minutes + try + { + Thread.sleep(60000 * 500); + } + catch (InterruptedException e) + { + log.error(e); + } + + stop = true; } - startSignal.countDown(); - // wait 5 minutes - try + else { - Thread.sleep(60000 * 5); + log.info("Wait for data"); } - catch (InterruptedException e) - { - log.error(e); - } - - stop = true; } - else + catch (Exception e) { - log.info("Wait for data"); + // TODO Auto-generated catch block + e.printStackTrace(); } doneSignal.await(); @@ -132,34 +140,39 @@ startSignal.await(); while (!stop) { - long time = System.currentTimeMillis(); - // get any word - int i = random.nextInt(words.length); - String word = words[i] + id; // "hello12" if thread#12 is creating it - // update statistic - updateStatistic(word); - // add actual node - createTree().addNode(word); - sessionLocal.save(); - System.out.println(Thread.currentThread() + " time : " + (System.currentTimeMillis() - time)); - try { - Thread.sleep(300); + + long time = System.currentTimeMillis(); + // get any word + int i = random.nextInt(words.length); + String word = words[i] + id; // "hello12" if thread#12 is creating it + // update statistic + updateStatistic(word); + // add actual node + createTree().addNode(word); + sessionLocal.save(); + log.info(Thread.currentThread() + " time : " + (System.currentTimeMillis() - time)); + + // try + // { + // Thread.sleep(300); + // } + // catch (InterruptedException e) + // { + // } } - catch (InterruptedException e) + catch (Exception e) { + log.error("An unexpected error happens", e); } } } - catch (Exception e) + catch (InterruptedException e) { - log.error("An unexpected error happens", e); - } - finally - { doneSignal.countDown(); } + } /** Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java 2010-01-17 15:12:24 UTC (rev 1454) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java 2010-01-18 08:39:04 UTC (rev 1455) @@ -107,9 +107,10 @@ */ public void run() { - try + + while (!stop) { - while (!stop) + try { Node threadNode = getRandomChild(rootLocal, "Thread*"); if (threadNode != null) @@ -135,22 +136,22 @@ Query q = qman.createQuery("SELECT * FROM nt:base WHERE jcr:path LIKE '" + contentNode.getPath() + "/%' and fn:name() = '" + word + "'", Query.SQL); + long time = System.currentTimeMillis(); QueryResult res = q.execute(); long sqlsize = res.getNodes().getSize(); - log.info("Exp: " + count + "\t found:" + sqlsize); + log.info("Exp: " + count + "\t found:" + sqlsize + " time=" + (System.currentTimeMillis() - time)); } } } - + catch (RepositoryException e) + { + log.error(e); + } + catch (Exception e) + { + log.error(e); + } } - catch (RepositoryException e) - { - log.error(e); - } - catch (Exception e) - { - log.error(e); - } }

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1454 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-17 10:12:24 -0500 (Sun, 17 Jan 2010) New Revision: 1454 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java Log: EXOJCR-405 test on JCR error in XA transaction Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java 2010-01-17 14:08:04 UTC (rev 1453) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/xa/TestUserTransaction.java 2010-01-17 15:12:24 UTC (rev 1454) @@ -32,6 +32,7 @@ import javax.jcr.SimpleCredentials; import javax.naming.InitialContext; import javax.transaction.UserTransaction; +import javax.transaction.xa.XAException; /** * Created by The eXo Platform SAS. <br> @@ -170,10 +171,14 @@ public void testUserTransactionFromJndi() throws Exception { assertNotNull(txService); - InitialContext ctx = new InitialContext(); - Object obj = ctx.lookup("UserTransaction"); - UserTransaction ut = (UserTransaction)obj; + // TODO in JNDI only JOTM today + //InitialContext ctx = new InitialContext(); + //Object obj = ctx.lookup("UserTransaction"); + //UserTransaction ut = (UserTransaction)obj; + + UserTransaction ut = txService.getUserTransaction(); + ut.begin(); Session s1 = repository.login(new SimpleCredentials("admin", "admin".toCharArray()), session.getWorkspace().getName()); @@ -187,10 +192,13 @@ public void testReuseUT() throws Exception { assertNotNull(txService); - InitialContext ctx = new InitialContext(); - Object obj = ctx.lookup("UserTransaction"); - UserTransaction ut = (UserTransaction)obj; + // TODO in JNDI only JOTM today + //InitialContext ctx = new InitialContext(); + //Object obj = ctx.lookup("UserTransaction"); + //UserTransaction ut = (UserTransaction)obj; + UserTransaction ut = txService.getUserTransaction(); + ut.begin(); Session s1 = @@ -211,4 +219,48 @@ } + public void testSaveException() throws Exception + { + assertNotNull(txService); + // TODO in JNDI only JOTM today + //InitialContext ctx = new InitialContext(); + //Object obj = ctx.lookup("UserTransaction"); + //UserTransaction ut = (UserTransaction)obj; + + UserTransaction ut = txService.getUserTransaction(); + + Session s0 = + repository.login(new SimpleCredentials("admin", "admin".toCharArray()), session.getWorkspace().getName()); + Node pretx = s0.getRootNode().addNode("pretx"); + s0.save(); + + pretx.remove(); // don't save now + + ut.begin(); + + Session s1 = + repository.login(new SimpleCredentials("admin", "admin".toCharArray()), session.getWorkspace().getName()); + + Node tx1 = s1.getRootNode().getNode("pretx").addNode("tx1"); + s1.save(); + + s0.save(); // save that parent of tx1 removed + + try + { + ut.commit(); + // internally XAException should be thrown + fail("XAException with InvalidItemState should occurs"); + } + catch (Throwable e) + { + // ok + e.printStackTrace(); + System.out.println(e); + } + + assertNotNull(session.getItem("/pretx/tx1")); + + } + }

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1453 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-01-17 09:08:04 -0500 (Sun, 17 Jan 2010) New Revision: 1453 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java Log: EXOJCR-331 : //made changes if needed Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2010-01-17 13:19:54 UTC (rev 1452) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/registration/JCRNodeTypeDataPersister.java 2010-01-17 14:08:04 UTC (rev 1453) @@ -400,9 +400,10 @@ if (observer != null) observer.afterUpdate(nodeTypeData, changesLog); } + //made changes if needed + if (changesLog.getSize() > 0) + dataManager.save(new TransactionChangesLog(changesLog)); - dataManager.save(new TransactionChangesLog(changesLog)); - } private boolean validatate()

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1452 - in jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: dataflow/session and 1 other directory.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-17 08:19:54 -0500 (Sun, 17 Jan 2010) New Revision: 1452 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java Log: EXOJCR-405 XASessionImpl enlistResource lifecycle rework, cleanup Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java 2010-01-17 13:17:52 UTC (rev 1451) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionFactory.java 2010-01-17 13:19:54 UTC (rev 1452) @@ -41,23 +41,22 @@ public class SessionFactory { - protected static Log log = ExoLogger.getLogger("jcr.SessionFactory"); + protected static Log LOG = ExoLogger.getLogger("jcr.SessionFactory"); - // private OrganizationService organizationService; + private final ExoContainer container; - private ExoContainer container; + private final TransactionService tService; - private TransactionService tService; + private final String workspaceName; - private String workspaceName; + private final TransactionableResourceManager txResourceManager; - private TransactionableResourceManager txResourceManager = null; - /** - * @param orgService - * @param tService - * @param config - * @param containerContext + * JCR Session factory. + * + * @param tService TransactionService + * @param config WorkspaceEntry + * @param containerContext ExoContainerContext */ public SessionFactory(TransactionService tService, WorkspaceEntry config, ExoContainerContext containerContext) { @@ -67,7 +66,6 @@ this.tService = tService; this.txResourceManager = new TransactionableResourceManager(); - // boolean tracking = "true".equalsIgnoreCase(System.getProperty("exo.jcr.session.tracking.active", "false")); if (tracking) { @@ -103,9 +101,10 @@ } /** - * @param orgService - * @param config - * @param containerContext + * JCR Session factory. + * + * @param config WorkspaceEntry + * @param containerContext ExoContainerContext */ public SessionFactory(WorkspaceEntry config, ExoContainerContext containerContext) { @@ -121,10 +120,6 @@ */ SessionImpl createSession(ConversationState user) throws RepositoryException, LoginException { - - // Check privilegies to access workspace first? - // .... - if (tService == null) { if (SessionReference.isStarted()) @@ -137,26 +132,14 @@ } } - XASessionImpl xaSession; if (SessionReference.isStarted()) { - xaSession = new TrackedXASession(workspaceName, user, container, tService, txResourceManager); + return new TrackedXASession(workspaceName, user, container, tService, txResourceManager); } else { - xaSession = new XASessionImpl(workspaceName, user, container, tService, txResourceManager); + return new XASessionImpl(workspaceName, user, container, tService, txResourceManager); } - - try - { - xaSession.enlistResource(); - - } - catch (XAException e) - { - throw new RepositoryException(e); - } - return xaSession; } } Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2010-01-17 13:17:52 UTC (rev 1451) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2010-01-17 13:19:54 UTC (rev 1452) @@ -97,7 +97,16 @@ this.txTimeout = tService.getDefaultTimeout(); this.tService = tService; this.txResourceManager = txResourceManager; - this.txResourceManager.add(this); + + // enlist on login instead of this.txResourceManager.add(this); + try + { + this.enlistResource(); + } + catch (XAException e) + { + throw new RepositoryException(e); + } } /** @@ -117,7 +126,10 @@ try { if (LOG.isDebugEnabled()) + { LOG.debug("Delist session: " + getSessionInfo() + ", " + this); + } + txResourceManager.remove(this); tService.delistResource(this); } @@ -136,12 +148,14 @@ */ public void enlistResource() throws XAException { - // TODO if session is dead? can we enlist it? try { if (LOG.isDebugEnabled()) + { LOG.debug("Enlist session: " + getSessionInfo() + ", " + this); + } + txResourceManager.add(this); tService.enlistResource(this); } @@ -170,7 +184,9 @@ } if (LOG.isDebugEnabled()) + { LOG.debug("Commit. Xid:" + xid + ", session: " + getSessionInfo() + ", " + this); + } } /** @@ -179,7 +195,10 @@ public void end(Xid xid, int flags) throws XAException { if (LOG.isDebugEnabled()) + { LOG.debug("End. Xid:" + xid + ", " + flags + ", session: " + getSessionInfo() + ", " + this); + } + startFlags = flags; } @@ -208,8 +227,10 @@ XASessionImpl session = (XASessionImpl)resource; boolean isSame = getUserID().equals(session.getUserID()); if (LOG.isDebugEnabled()) + { LOG.debug("isSameRM: " + getSessionInfo() + " -- " + session.getSessionInfo() + " : " + isSame + ", " + this + " -- " + session + ", Flags:" + startFlags); + } return isSame; } return false; @@ -221,7 +242,10 @@ public int prepare(Xid xid) throws XAException { if (LOG.isDebugEnabled()) + { LOG.debug("Prepare. Xid:" + xid + ", session: " + getSessionInfo() + ", " + this); + } + return XA_OK; } @@ -239,8 +263,11 @@ public void rollback(Xid xid) throws XAException { txResourceManager.rollback(this); + if (LOG.isDebugEnabled()) + { LOG.debug("Rollback. Xid:" + xid + ", session: " + getSessionInfo() + ", " + this); + } } /** @@ -267,8 +294,11 @@ { txResourceManager.start(this); startFlags = flags; + if (LOG.isDebugEnabled()) + { LOG.debug("Start. Xid:" + xid + ", " + flags + ", session: " + getSessionInfo() + ", " + this); + } } /** @@ -278,23 +308,30 @@ public void logout() { if (LOG.isDebugEnabled()) + { LOG.debug("Logout. Session: " + getSessionInfo() + ", " + this); + } - // Rolling back this session only - getTransientNodesManager().getTransactManager().rollback(); - - // Remove session from this user sessions list - txResourceManager.remove(this); - - super.logout(); try { - delistResource(); - startFlags = TMNOFLAGS; + // Rolling back this session only + getTransientNodesManager().getTransactManager().rollback(); + + super.logout(); } - catch (XAException e) + finally { - LOG.error("Logut error " + e, e); + // Delist and remove session from this user sessions list in TransactionableDataManager + // txResourceManager.remove(this) will be called in delistResource() + try + { + delistResource(); + startFlags = TMNOFLAGS; + } + catch (XAException e) + { + LOG.error("Logut error " + e, e); + } } } Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java 2010-01-17 13:17:52 UTC (rev 1451) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/TransactionableResourceManager.java 2010-01-17 13:19:54 UTC (rev 1452) @@ -50,7 +50,7 @@ /** * XASessions involved in transaction. Sessions stored by userId. */ - private Map<String, List<SoftReference<XASessionImpl>>> txManagers = + private Map<String, List<SoftReference<XASessionImpl>>> txResources = new HashMap<String, List<SoftReference<XASessionImpl>>>(); /** @@ -68,7 +68,7 @@ */ synchronized public void add(XASessionImpl userSession) { - final List<SoftReference<XASessionImpl>> joinedList = txManagers.get(userSession.getUserID()); + final List<SoftReference<XASessionImpl>> joinedList = txResources.get(userSession.getUserID()); if (joinedList != null) { // remove unused session from user list and put this list at the end @@ -94,9 +94,13 @@ final List<SoftReference<XASessionImpl>> newJoinedList = new ArrayList<SoftReference<XASessionImpl>>(); final List<SoftReference<XASessionImpl>> previous = putIfAbsent(userSession.getUserID(), newJoinedList); if (previous != null) + { previous.add(new SoftReference<XASessionImpl>(userSession)); + } else + { newJoinedList.add(new SoftReference<XASessionImpl>(userSession)); + } } } @@ -108,7 +112,7 @@ */ synchronized public void remove(XASessionImpl userSession) { - final List<SoftReference<XASessionImpl>> joinedList = txManagers.get(userSession.getUserID()); + final List<SoftReference<XASessionImpl>> joinedList = txResources.get(userSession.getUserID()); if (joinedList != null) { // traverse and remove unused sessions and given one @@ -124,7 +128,9 @@ // if list is empty - remove mapping to the list if (joinedList.size() <= 0) - txManagers.remove(userSession.getUserID()); + { + txResources.remove(userSession.getUserID()); + } } } @@ -138,8 +144,9 @@ */ synchronized public void commit(XASessionImpl userSession) throws TransactionException { - List<SoftReference<XASessionImpl>> joinedList = txManagers.remove(userSession.getUserID()); + List<SoftReference<XASessionImpl>> joinedList = txResources.remove(userSession.getUserID()); if (joinedList != null) + { for (SoftReference<XASessionImpl> sr : joinedList) { XASessionImpl xaSession = sr.get(); @@ -149,9 +156,51 @@ txManager.commit(); } } + } } /** + * TODO proposal + * @param userSession + * @throws TransactionException + */ + private void commit1(XASessionImpl userSession) throws TransactionException + { + List<XASessionImpl> xaSessions = null; + synchronized (this) + { + List<SoftReference<XASessionImpl>> joinedList = txResources.remove(userSession.getUserID()); + if (joinedList != null) + for (SoftReference<XASessionImpl> sr : joinedList) + { + XASessionImpl xaSession = sr.get(); + if (xaSession != null) + { + if (xaSessions == null) + { + xaSessions = new ArrayList<XASessionImpl>(); + } + xaSessions.add(xaSession); + } + } + } + if (xaSessions != null) + { + for (XASessionImpl xaSession : xaSessions) + { + synchronized (xaSession) + { + if (xaSession.isLive()) + { + TransactionableDataManager txManager = xaSession.getTransientNodesManager().getTransactManager(); + txManager.commit(); + } + } + } + } + } + + /** * Start transaction on all sessions. * * @param userSession @@ -159,8 +208,9 @@ */ synchronized public void start(XASessionImpl userSession) { - List<SoftReference<XASessionImpl>> joinedList = txManagers.get(userSession.getUserID()); + List<SoftReference<XASessionImpl>> joinedList = txResources.get(userSession.getUserID()); if (joinedList != null) + { for (SoftReference<XASessionImpl> sr : joinedList) { XASessionImpl xaSession = sr.get(); @@ -170,6 +220,7 @@ txManager.start(); } } + } } /** @@ -180,8 +231,9 @@ */ synchronized public void rollback(XASessionImpl userSession) { - List<SoftReference<XASessionImpl>> joinedList = txManagers.remove(userSession.getUserID()); + List<SoftReference<XASessionImpl>> joinedList = txResources.remove(userSession.getUserID()); if (joinedList != null) + { for (SoftReference<XASessionImpl> sr : joinedList) { XASessionImpl xaSession = sr.get(); @@ -191,17 +243,18 @@ txManager.rollback(); } } + } } private List<SoftReference<XASessionImpl>> putIfAbsent(String key, List<SoftReference<XASessionImpl>> value) { - if (!txManagers.containsKey(key)) + if (!txResources.containsKey(key)) { - return txManagers.put(key, value); + return txResources.put(key, value); } else { - return txManagers.get(key); + return txResources.get(key); } }

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1451 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-17 08:17:52 -0500 (Sun, 17 Jan 2010) New Revision: 1451 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ReadOnlyWorkspaceException.java jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java Log: EXOJCR-405 isolated operation errors handling rework Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-17 12:13:44 UTC (rev 1450) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-01-17 13:17:52 UTC (rev 1451) @@ -291,7 +291,8 @@ } @Override - protected void txAction() throws RepositoryException + protected void txAction() throws RepositoryException, NotSupportedException, SystemException, SecurityException, + IllegalStateException, RollbackException, HeuristicMixedException, HeuristicRollbackException { super.txAction(); Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ReadOnlyWorkspaceException.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ReadOnlyWorkspaceException.java 2010-01-17 12:13:44 UTC (rev 1450) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ReadOnlyWorkspaceException.java 2010-01-17 13:17:52 UTC (rev 1451) @@ -38,7 +38,7 @@ super(message); } - public ReadOnlyWorkspaceException(ReadOnlyWorkspaceException e) + public ReadOnlyWorkspaceException(Throwable e) { super(e); } Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java 2010-01-17 12:13:44 UTC (rev 1450) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TxIsolatedOperation.java 2010-01-17 13:17:52 UTC (rev 1451) @@ -12,13 +12,12 @@ import javax.transaction.InvalidTransactionException; import javax.transaction.NotSupportedException; import javax.transaction.RollbackException; -import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; /** - * Handles XA transactionalyisolated operation. I.e. Action of this operation will be executed in dedicated global transaction. + * Handles XA transactionaly isolated operation. I.e. Action of this operation will be executed in dedicated global transaction. * If another current transaction exists, the one will be suspended and resumed after the execution. * At other hand if nested isolated operations perform they will use same (current, active) transaction. */ @@ -60,15 +59,26 @@ /** * Apply action in new XA transaction (begin then commit or rollback). - * Action will runs in dedicated (isolated) XA transaction, i.e. only JCR storage stuff will be involved to. + * Action will runs in dedicated XA transaction, i.e. only JCR storage stuff will be involved to. * But if it's a nested isolated operation it will run the action assuming the same (current, active) transaction. + * + * @throws SystemException if XA unexpected error + * @throws NotSupportedException if unsupported XA operation + * @throws HeuristicRollbackException if all relevant updates have been rolled back on commit + * @throws HeuristicMixedException if some relevant updates have been committed and others have been rolled back on commit + * @throws RollbackException rollback error + * @throws IllegalStateException if thread is not associated with a transaction + * @throws SecurityException if thread is not allowed to commit the transaction */ - protected void txAction() throws RepositoryException + protected void txAction() throws RepositoryException, NotSupportedException, SystemException, SecurityException, + IllegalStateException, RollbackException, HeuristicMixedException, HeuristicRollbackException { final boolean actInTx = currentIsolated.get() == null; - try + if (actInTx) { - if (actInTx) + // it's rooted isolated operation + boolean rollback = true; + try { beginTx(); @@ -78,81 +88,43 @@ { currentIsolated.set(current); } - } - action(); + action(); - if (actInTx) - { commitTx(); - - // remove current isolated transaction from this thread - currentIsolated.remove(); + rollback = false; } - } - catch (RollbackException e) - { - if (actInTx) + finally { + if (rollback) + { + doRollback(); + } + // remove current isolated transaction from this thread currentIsolated.remove(); } - // Indicate that the transaction has been rolled back rather than committed. - throw new RepositoryException(e); } - catch (JCRInvalidItemStateException e) + else { - doRollback(actInTx); - throw new JCRInvalidItemStateException(e.getMessage(), e.getIdentifier(), e.getState(), e); + // it's nested isolated operation + action(); } - catch (InvalidItemStateException e) - { - doRollback(actInTx); - throw new InvalidItemStateException(e); - } - catch (ItemExistsException e) - { - doRollback(actInTx); - throw new ItemExistsException(e); - } - catch (ReadOnlyWorkspaceException e) - { - doRollback(actInTx); - throw new ReadOnlyWorkspaceException(e); - } - catch (RepositoryException e) - { - doRollback(actInTx); - throw new RepositoryException(e); - } - catch (Exception e) - { - doRollback(actInTx); - throw new RepositoryException(e); - } } /** - * Performs rollback of the action if it's acts in original isolated transaction. - * If it's acts as a nested operation, the actions will be commited in original (rooted) isolated trnsaction. - * - * @param actInTx boolean, true if it's original isolated transaction + * Performs rollback of the action. */ - private void doRollback(boolean actInTx) + private void doRollback() { - if (actInTx) + try { - try - { - rollbackTx(); - } - catch (Exception e1) - { - LOG.error("Rollback error ", e1); - } - // remove current isolated transaction from this thread - currentIsolated.remove(); + rollbackTx(); } + catch (Exception e1) + { + LOG.error("Rollback error ", e1); + } } /** @@ -167,14 +139,41 @@ // suspend current ransaction and create one new for the JCR storage (cache etc.) // after the new transaction done we'll resume the current. - // TODO if nested in storage, e.g. save causes read, use one tx, e.g. via ThreadLocal - //if (txManager.getStatus() == Status.STATUS_ACTIVE) - Transaction current = txManager.suspend(); + Throwable actionError = null; // used for resume errors handling try { txAction(); } + catch (RollbackException e) + { + // Indicate that the transaction has been rolled back rather than committed. + throw new RepositoryException(actionError = e); + } + catch (JCRInvalidItemStateException e) + { + throw new JCRInvalidItemStateException(e.getMessage(), e.getIdentifier(), e.getState(), actionError = e); + } + catch (InvalidItemStateException e) + { + throw new InvalidItemStateException(actionError = e); + } + catch (ItemExistsException e) + { + throw new ItemExistsException(actionError = e); + } + catch (ReadOnlyWorkspaceException e) + { + throw new ReadOnlyWorkspaceException(actionError = e); + } + catch (RepositoryException e) + { + throw new RepositoryException(actionError = e); + } + catch (Throwable e) + { + throw new RepositoryException(actionError = e); + } finally { if (current != null) @@ -185,18 +184,43 @@ } catch (InvalidTransactionException e) { - throw new RepositoryException(e); + if (actionError == null) + { + throw new RepositoryException("Error of Transaction resume", e); + } + else + { + LOG.error("Error of Transaction resume", e); + } } catch (IllegalStateException e) { - throw new RepositoryException(e); + if (actionError == null) + { + throw new RepositoryException("Error of Transaction resume", e); + } + else + { + LOG.error("Error of Transaction resume", e); + } } + catch (SystemException e) + { + if (actionError == null) + { + throw new RepositoryException("Error of Transaction resume", e); + } + else + { + LOG.error("Error of Transaction resume", e); + } + } } } } catch (SystemException e) { - throw new RepositoryException(e); + throw new RepositoryException("Error of Transaction suspend", e); } // TODO to do not commit in curr thread (i.e. curr tx)

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1450 - jcr/trunk.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-01-17 07:13:44 -0500 (Sun, 17 Jan 2010) New Revision: 1450 Removed: jcr/trunk/component/ Log: Component folder removed

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1449 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-01-17 06:14:17 -0500 (Sun, 17 Jan 2010) New Revision: 1449 Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java Log: EXOJCR-331 : read test with modes Added: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java (rev 0) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java 2010-01-17 11:14:17 UTC (rev 1449) @@ -0,0 +1,169 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.jcr.lab.cluster.test; + +import org.exoplatform.services.jcr.JcrAPIBaseTest; +import org.exoplatform.services.jcr.core.CredentialsImpl; +import org.exoplatform.services.jcr.impl.core.SessionImpl; +import org.exoplatform.services.jcr.lab.cluster.prepare.TestLoadIndexerWriter; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.Random; + +import javax.jcr.Node; +import javax.jcr.NodeIterator; +import javax.jcr.RepositoryException; +import javax.jcr.query.Query; +import javax.jcr.query.QueryManager; +import javax.jcr.query.QueryResult; + +/** + * @author <a href="mailto:nikolazius@gmail.com">Nikolay Zamosenchuk</a> + * @version $Id: TestLoadIndexerQuery.java 34360 2009-07-22 23:58:59Z nzamosenchuk $ + * + */ +public class TestLoadIndexerQueryWithModes extends JcrAPIBaseTest +{ + + private Log log = ExoLogger.getLogger(TestLoadIndexerQueryWithModes.class); + + private boolean stop = false; + + private int threadCount = 20; + + public void testQuery() throws RepositoryException + { + try + { + System.out.println("Skip (y/n) :"); + BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); + String line = reader.readLine(); + if (!line.equals("y")) + { + log.info("Creating threads..."); + for (int i = 0; i < threadCount; i++) + { + // create new thread and start it + new Thread(new QueryTask()).start(); + log.info("Thread#" + i + " created and started."); + } + } + else + { + log.info("Wait for data"); + } + + // wait 4 minutes + + Thread.sleep(60000 * 4000); + } + catch (Exception e) + { + log.error(e); + } + + stop = true; + } + + private class QueryTask implements Runnable + { + private SessionImpl sessionLocal; + + private Node rootLocal; + + private Random random; + + public QueryTask() throws RepositoryException + { + // login + CredentialsImpl credentials = new CredentialsImpl("admin", "admin".toCharArray()); + sessionLocal = (SessionImpl)repository.login(credentials, "ws"); + // prepare nodes + rootLocal = sessionLocal.getRootNode(); + random = new Random(); + } + + /** + * @see java.lang.Runnable#run() + */ + public void run() + { + try + { + while (!stop) + { + Node threadNode = getRandomChild(rootLocal, "Thread*"); + if (threadNode != null) + { + Node statisticNode = threadNode.getNode(TestLoadIndexerWriter.STATISTIC); + Node contentNode = threadNode.getNode(TestLoadIndexerWriter.CONTENT); + Node wordNode = getRandomChild(statisticNode, "*"); + if (wordNode != null) + { + String word = wordNode.getName(); + Long count = wordNode.getProperty(TestLoadIndexerWriter.COUNT).getLong(); + + try + { + Thread.sleep(2000); + } + catch (InterruptedException e1) + { + } + + QueryManager qman = sessionLocal.getWorkspace().getQueryManager(); + + Query q = + qman.createQuery("SELECT * FROM nt:base WHERE jcr:path LIKE '" + contentNode.getPath() + + "/%' and fn:name() = '" + word + "'", Query.SQL); + QueryResult res = q.execute(); + long sqlsize = res.getNodes().getSize(); + log.info("Exp: " + count + "\t found:" + sqlsize); + } + } + } + + } + catch (RepositoryException e) + { + log.error(e); + } + catch (Exception e) + { + log.error(e); + } + + } + + private Node getRandomChild(Node parent, String pattern) throws RepositoryException + { + NodeIterator iterator = parent.getNodes(pattern); + if (iterator.getSize() < 1) + { + return null; + } + int i = random.nextInt((int)iterator.getSize()); + iterator.skip(i); + return iterator.nextNode(); + } + } +} Property changes on: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestLoadIndexerQueryWithModes.java ___________________________________________________________________ Name: svn:mime-type + text/plain

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1448 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-01-17 05:54:55 -0500 (Sun, 17 Jan 2010) New Revision: 1448 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java Log: EXOJCR-405: add XASession to TransactionableResourceManager when enlistResource is called Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2010-01-17 09:26:41 UTC (rev 1447) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/XASessionImpl.java 2010-01-17 10:54:55 UTC (rev 1448) @@ -118,7 +118,7 @@ { if (LOG.isDebugEnabled()) LOG.debug("Delist session: " + getSessionInfo() + ", " + this); - //txResourceManager.remove(this); + txResourceManager.remove(this); tService.delistResource(this); } catch (RollbackException e) @@ -142,7 +142,7 @@ { if (LOG.isDebugEnabled()) LOG.debug("Enlist session: " + getSessionInfo() + ", " + this); - //txResourceManager.add(this); + txResourceManager.add(this); tService.enlistResource(this); } catch (RollbackException e)

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1447 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster.

by do-not-reply＠jboss.org

Author: skabashnyuk Date: 2010-01-17 04:26:41 -0500 (Sun, 17 Jan 2010) New Revision: 1447 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws1.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws.xml jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml Log: EXOJCR-331 : fetchInMemoryState="false" Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml 2010-01-17 09:23:09 UTC (rev 1446) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-config-ws.xml 2010-01-17 09:26:41 UTC (rev 1447) @@ -9,7 +9,7 @@ Fetch in memory state is enable, because second cluster-node currently doesn't work properly on clear cache --> - <stateRetrieval timeout="20000" fetchInMemoryState="true" nonBlocking="true"/> + <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>  - <stateRetrieval timeout="20000" fetchInMemoryState="true" nonBlocking="true"/> + <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>  - <TCP bind_addr="127.0.0.1" start_port="9700" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true" max_bundle_size="64000" Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml 2010-01-17 09:23:09 UTC (rev 1446) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/cluster/test-jbosscache-indexer-config-exoloader_db1_ws1.xml 2010-01-17 09:26:41 UTC (rev 1447) @@ -10,27 +10,6 @@ <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_db1_ws1"> <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/> <jgroupsConfig> -  - <TCP bind_addr="127.0.0.1" start_port="9750" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true" max_bundle_size="64000"

16 years, 3 months

1
0
0 / 0

exo-jcr SVN: r1446 - jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone.

by do-not-reply＠jboss.org

Author: pnedonosko Date: 2010-01-17 04:23:09 -0500 (Sun, 17 Jan 2010) New Revision: 1446 Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml Log: EXOJCR-410 track-without-transaction=false (it's by default now) removed from JCR configuration for JOTM TS Modified: jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml =================================================================== --- jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-17 09:12:54 UTC (rev 1445) +++ jcr/branches/1.12.0-JBCCACHE/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2010-01-17 09:23:09 UTC (rev 1446) @@ -217,7 +217,7 @@ <init-params> <value-param> <name>timeout</name> - <value>5</value> + <value>300</value> </value-param> </init-params> </component -->

16 years, 3 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits January 2010