Skip to content
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.

Sign up for GitHub

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

Mcc cdh5.10.1 #1

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Mcc cdh5.10.1 #1

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4a80b86
Hbase MCC for CDH5.10.1
balachandrapai Jun 25, 2017
73666ad
Project upgraded to CDH5.10.1
balachandrapai Jun 25, 2017
471c03a
Hbase MCC for CDH5.10.1
balachandrapai Jun 25, 2017
20a85e2
Fixed Build errors
balachandrapai Jun 26, 2017
1c487ef
Post Build fixes
balachandrapai Jun 26, 2017
592fcc7
Post Build error fixes
balachandrapai Jun 26, 2017
6b58ad0
Adding HBaseMCCTest
balachandrapai Jun 26, 2017
876e04c
Adding HBaseMCCTest
balachandrapai Jun 26, 2017
be233bd
Removing HBaseMCCTest
balachandrapai Jun 26, 2017
3885237
Adding HBaseMCCTest and resources
balachandrapai Jun 26, 2017
ebf7178
After review changes
balachandrapai Jun 30, 2017
cb30043
Updated changes
balachandrapai Jun 30, 2017
03178de
removing idea libraries
balachandrapai Jun 30, 2017
a443a6c
Committing changes
balachandrapai Jun 30, 2017
13b3554
Committing changes
balachandrapai Jul 3, 2017
ee6e678
Committing changes
balachandrapai Jul 3, 2017
9645982
Committing changes
balachandrapai Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,77 +22,77 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.5.0-cdh5.3.0</version>
<version>2.6.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put this into a variable. This makes later changes easier.

</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.5.0-cdh5.3.0</version>
<version>2.6.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

<type>test-jar</type>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put this into a variable. This makes later changes easier.

</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-protocol</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-hadoop2-compat</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

<!-- <scope>runtime</scope> -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this comment.

</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-hadoop2-compat</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

<type>test-jar</type>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

<type>test-jar</type>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-hadoop-compat</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-hadoop-compat</artifactId>
<version>0.98.6-cdh5.3.0</version>
<version>1.2.0-cdh5.10.1</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dito.

<type>test-jar</type>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>com.cloudera.api</groupId>
<artifactId>cloudera-manager-api</artifactId>
<version>5.3.1</version>
<version>5.10.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/apache/hadoop/hbase/client/HBaseMultiClusterConfigUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,13 @@ public static Configuration combineConfigurations(Configuration primary, Configu
return combineConfigurations(primary, map);
}

public static Configuration combineConfigurations(Configuration primary, Configuration failover, Configuration failover2 ) {
Map<String, Configuration> map = new HashMap<String, Configuration>();
map.put("failover1", failover);
map.put("failover2", failover2);
return combineConfigurations(primary, map);
}

// This method obtains the Hbase configuration from 2 clusters and combines
// them
public static Configuration combineConfigurations(String host1, String user1, String pwd1,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/hadoop/hbase/client/HBaseTableFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
import org.apache.hadoop.hbase.client.HTableInterface;

public interface HBaseTableFunction<T> {
public T call(HTableInterface table) throws Exception;
public T call(Table table) throws Exception;
}
12 changes: 6 additions & 6 deletions src/main/java/org/apache/hadoop/hbase/client/HConnectionManagerMultiClusterWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public class HConnectionManagerMultiClusterWrapper {

public static HConnection createConnection(Configuration conf)
public static Connection createConnection(Configuration conf)
throws IOException {

Logger LOG = Logger.getLogger(HConnectionManagerMultiClusterWrapper.class);
Expand All @@ -21,31 +21,31 @@ public static HConnection createConnection(Configuration conf)

if (failoverClusters.size() == 0) {
LOG.info(" -- Getting a signle cluster connection !!");
return HConnectionManager.createConnection(conf);
return ConnectionFactory.createConnection(conf);
} else {

Map<String, Configuration> configMap = HBaseMultiClusterConfigUtil
.splitMultiConfigFile(conf);

LOG.info(" -- Getting primary Connction");
HConnection primaryConnection = HConnectionManager
Connection primaryConnection = ConnectionFactory
.createConnection(configMap
.get(HBaseMultiClusterConfigUtil.PRIMARY_NAME));
LOG.info(" --- Got primary Connction");

ArrayList<HConnection> failoverConnections = new ArrayList<HConnection>();
ArrayList<Connection> failoverConnections = new ArrayList<Connection>();

for (Entry<String, Configuration> entry : configMap.entrySet()) {
if (!entry.getKey().equals(HBaseMultiClusterConfigUtil.PRIMARY_NAME)) {
LOG.info(" -- Getting failure Connction");
failoverConnections.add(HConnectionManager.createConnection(entry
failoverConnections.add(ConnectionFactory.createConnection(entry
.getValue()));
LOG.info(" --- Got failover Connction");
}
}

return new HConnectionMultiCluster(conf, primaryConnection,
failoverConnections.toArray(new HConnection[0]));
failoverConnections.toArray(new Connection[0]));
}
}
}
Loading