Projects >> omid >>19522416c79a51f4b1870fb7e3a7eb97e9d45dc1

Chunk
Conflicting content 
      if (!LocalBookKeeper.waitForServerUp("localhost:2181", 10000)) {
         throw new Exception("Error starting zookeeper/bookkeeper");
      }
<<<<<<< HEAD
      
      tsoExecutor.execute(tsoTask);
      Thread.sleep(5000);
      
      // TSO Setup
      Runnable tsoTask = new Runnable() {
          public void run() {
             try {
                String[] args = new String[] { 
                        "-port", "1234",
                        "-batch", "100",
                        "-ensemble", "4",
                        "-quorum", "2",
                        "-zk", "localhost:2181"
                };
                TSOServer.main(args);
             } catch (InterruptedException e) {
                // go away quietly
             } catch (Exception e) {
                LOG.error("Error starting TSO", e);
             }
          }
       };

      waitForSocketListening("localhost", 1234);
      
      Thread.sleep(5000);
=======

      Thread.sleep(1000);
      tsothread.start();
      waitForSocketListening("localhost", 1234);
>>>>>>> f6f7b87fd389603a34bce90d8d1cb5ab6a45b153

      // HBase setup
      hbaseConf = HBaseConfiguration.create();
Solution content 
      if (!LocalBookKeeper.waitForServerUp("localhost:2181", 10000)) {
         throw new Exception("Error starting zookeeper/bookkeeper");
      }

      Thread.sleep(1000);
      
      // TSO Setup
      Runnable tsoTask = new Runnable() {
          public void run() {
             try {
                String[] args = new String[] { 
                        "-port", "1234",
                        "-batch", "100",
                        "-ensemble", "4",
                        "-quorum", "2",
                        "-zk", "localhost:2181"
                };
                TSOServer.main(args);
             } catch (InterruptedException e) {
                // go away quietly
             } catch (Exception e) {
                LOG.error("Error starting TSO", e);
             }
          }
       };

      tsoExecutor.execute(tsoTask);
      waitForSocketListening("localhost", 1234);
      
      // HBase setup
      hbaseConf = HBaseConfiguration.create();
File
OmidTestBase.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
      if (hbasecluster != null) {
         hbasecluster.shutdown();
      }
<<<<<<< HEAD
      tsoExecutor.shutdownNow();
      bkExecutor.shutdownNow();
=======
      if (tsothread != null) {
         tsothread.interrupt();
      }
      if (bkthread != null) {
         bkthread.interrupt();
      }

>>>>>>> f6f7b87fd389603a34bce90d8d1cb5ab6a45b153
      waitForSocketNotListening("localhost", 1234);
   }
Solution content 
      if (hbasecluster != null) {
         hbasecluster.shutdown();
      }

      tsoExecutor.shutdownNow();
      bkExecutor.shutdownNow();
      waitForSocketNotListening("localhost", 1234);
   }
File
OmidTestBase.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation