accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1455985 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ server/src/main/java/org/apache/accumulo/server/trace/ src/ test/...
Date Wed, 13 Mar 2013 15:05:58 GMT
Author: ecn
Date: Wed Mar 13 15:05:57 2013
New Revision: 1455985

URL: http://svn.apache.org/r1455985
Log:
ACCUMULO-1173 reverting setting thread state

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/proxy/proxy.properties
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/system/continuous/ingesters.txt.example

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1455980
  Merged /accumulo/branches/1.5:r1455984
  Merged /accumulo/branches/1.4:r1455980

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/assemble:r1455980
  Merged /accumulo/branches/1.4/assemble:r1455980
  Merged /accumulo/branches/1.5/assemble:r1455984

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1455984
  Merged /accumulo/branches/1.4/core:r1455980
  Merged /accumulo/branches/1.4/src/core:r1455980

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/examples:r1455980
  Merged /accumulo/branches/1.5/examples:r1455984

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1455984
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1455980
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1455980

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455980
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455984
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1455980

Modified: accumulo/trunk/proxy/proxy.properties
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/proxy.properties?rev=1455985&r1=1455984&r2=1455985&view=diff
==============================================================================
--- accumulo/trunk/proxy/proxy.properties (original)
+++ accumulo/trunk/proxy/proxy.properties Wed Mar 13 15:05:57 2013
@@ -1,5 +1,5 @@
 org.apache.accumulo.proxy.ProxyServer.useMockInstance=false
-org.apache.accumulo.proxy.ProxyServer.useMiniAccumulo=true
+org.apache.accumulo.proxy.ProxyServer.useMiniAccumulo=false
 org.apache.accumulo.proxy.ProxyServer.protocolFactory=org.apache.thrift.protocol.TCompactProtocol$Factory
 org.apache.accumulo.proxy.ProxyServer.port=42424
 

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1455980
  Merged /accumulo/branches/1.5/server:r1455984
  Merged /accumulo/branches/1.4/src/server:r1455980

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java?rev=1455985&r1=1455984&r2=1455985&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
(original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
Wed Mar 13 15:05:57 2013
@@ -65,7 +65,6 @@ import org.apache.thrift.transport.TServ
 import org.apache.thrift.transport.TServerTransport;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
-import org.apache.thrift.transport.TTransportFactory;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
@@ -199,13 +198,6 @@ public class TraceServer implements Watc
     final TServerTransport transport = new TServerSocket(sock);
     TThreadPoolServer.Args options = new TThreadPoolServer.Args(transport);
     options.processor(new Processor<Iface>(new Receiver()));
-    options.transportFactory(new TTransportFactory() {
-      @Override
-      public TTransport getTransport(TTransport trans) {
-        Thread.currentThread().setDaemon(true);
-        return super.getTransport(trans);
-      }
-    });
     server = new TThreadPoolServer(options);
     final InetSocketAddress address = new InetSocketAddress(hostname, sock.getLocalPort());
     registerInZooKeeper(AddressUtil.toString(address));

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1455980
  Merged /accumulo/branches/1.4/src/src:r1455980
  Merged /accumulo/branches/1.5/src:r1455984

Modified: accumulo/trunk/test/system/continuous/ingesters.txt.example
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/ingesters.txt.example?rev=1455985&r1=1455984&r2=1455985&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/ingesters.txt.example (original)
+++ accumulo/trunk/test/system/continuous/ingesters.txt.example Wed Mar 13 15:05:57 2013
@@ -1,2 +1 @@
-host1
-host2
+localhost



Mime
View raw message