github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-04 08:19:57 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-979: MySQL direct connector is not working correct after moving password to credential cache

Browse Source 
(Jarek Jarcec Cecho via Kate Ting)
This commit is contained in:
Kate Ting 2013-04-06 17:29:02 -04:00
parent ef093399bf
commit 00d09b7b25
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/com/cloudera/sqoop/manager/MySQLUtils.java
View File

@ -49,8 +49,6 @@ private MySQLUtils() {
org.apache.sqoop.manager.MySQLUtils.CONNECT_STRING_KEY; org.apache.sqoop.manager.MySQLUtils.CONNECT_STRING_KEY;
public static final String USERNAME_KEY = public static final String USERNAME_KEY =
org.apache.sqoop.manager.MySQLUtils.USERNAME_KEY; org.apache.sqoop.manager.MySQLUtils.USERNAME_KEY;
public static final String PASSWORD_KEY =
org.apache.sqoop.manager.MySQLUtils.PASSWORD_KEY;
public static final String WHERE_CLAUSE_KEY = public static final String WHERE_CLAUSE_KEY =
org.apache.sqoop.manager.MySQLUtils.WHERE_CLAUSE_KEY; org.apache.sqoop.manager.MySQLUtils.WHERE_CLAUSE_KEY;
public static final String EXTRA_ARGS_KEY = public static final String EXTRA_ARGS_KEY =

6
src/java/org/apache/sqoop/manager/MySQLUtils.java
View File

@ -29,11 +29,13 @@
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.JobConf;
import com.cloudera.sqoop.config.ConfigurationConstants; import com.cloudera.sqoop.config.ConfigurationConstants;
import com.cloudera.sqoop.config.ConfigurationHelper; import com.cloudera.sqoop.config.ConfigurationHelper;
import com.cloudera.sqoop.util.DirectImportUtils; import com.cloudera.sqoop.util.DirectImportUtils;
import org.apache.sqoop.lib.DelimiterSet; import org.apache.sqoop.lib.DelimiterSet;
import org.apache.sqoop.mapreduce.db.DBConfiguration;
/** /**
* Helper methods and constants for MySQL imports/exports. * Helper methods and constants for MySQL imports/exports.
@ -65,8 +67,6 @@ private MySQLUtils() {
ConfigurationHelper.getDbUrlProperty(); ConfigurationHelper.getDbUrlProperty();
public static final String USERNAME_KEY = public static final String USERNAME_KEY =
ConfigurationHelper.getDbUsernameProperty(); ConfigurationHelper.getDbUsernameProperty();
public static final String PASSWORD_KEY =
ConfigurationHelper.getDbPasswordProperty();
public static final String WHERE_CLAUSE_KEY = public static final String WHERE_CLAUSE_KEY =
ConfigurationHelper.getDbInputConditionsProperty(); ConfigurationHelper.getDbInputConditionsProperty();
@ -110,7 +110,7 @@ public static String writePasswordFile(Configuration conf)
// thing, and returns the correct exit status. But given our inability to // thing, and returns the correct exit status. But given our inability to
// re-read the permissions associated with a file, we'll have to make do // re-read the permissions associated with a file, we'll have to make do
// with this. // with this.
String password = conf.get(PASSWORD_KEY); String password = DBConfiguration.getPassword((JobConf) conf);
BufferedWriter w = new BufferedWriter(new OutputStreamWriter( BufferedWriter w = new BufferedWriter(new OutputStreamWriter(
new FileOutputStream(tempFile))); new FileOutputStream(tempFile)));
w.write("[client]\n"); w.write("[client]\n");

4
src/java/org/apache/sqoop/mapreduce/MySQLDumpMapper.java
View File

@ -30,9 +30,11 @@
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.sqoop.util.AsyncSink; import org.apache.sqoop.util.AsyncSink;
import org.apache.sqoop.util.JdbcUrl; import org.apache.sqoop.util.JdbcUrl;
import org.apache.sqoop.util.PerfCounters; import org.apache.sqoop.util.PerfCounters;
import org.apache.sqoop.mapreduce.db.DBConfiguration;
import com.cloudera.sqoop.lib.DelimiterSet; import com.cloudera.sqoop.lib.DelimiterSet;
import com.cloudera.sqoop.lib.FieldFormatter; import com.cloudera.sqoop.lib.FieldFormatter;
import com.cloudera.sqoop.lib.RecordParser; import com.cloudera.sqoop.lib.RecordParser;
@ -345,7 +347,7 @@ public void map(String splitConditions, NullWritable val, Context context)
args.add(MySQLUtils.MYSQL_DUMP_CMD); // requires that this is on the path. args.add(MySQLUtils.MYSQL_DUMP_CMD); // requires that this is on the path.
String password = conf.get(MySQLUtils.PASSWORD_KEY); String password = DBConfiguration.getPassword((JobConf) conf);
String passwordFile = null; String passwordFile = null;
Process p = null; Process p = null;

3
src/java/org/apache/sqoop/mapreduce/MySQLExportMapper.java
View File

@ -28,6 +28,7 @@
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.sqoop.util.AsyncSink; import org.apache.sqoop.util.AsyncSink;
import org.apache.sqoop.util.JdbcUrl; import org.apache.sqoop.util.JdbcUrl;
import org.apache.sqoop.util.LoggingAsyncSink; import org.apache.sqoop.util.LoggingAsyncSink;
@ -138,7 +139,7 @@ private void initMySQLImportProcess() throws IOException {
} }
args.add(MySQLUtils.MYSQL_IMPORT_CMD); // needs to be on the path. args.add(MySQLUtils.MYSQL_IMPORT_CMD); // needs to be on the path.
String password = conf.get(MySQLUtils.PASSWORD_KEY); String password = DBConfiguration.getPassword((JobConf) conf);
if (null != password && password.length() > 0) { if (null != password && password.length() > 0) {
passwordFile = new File(MySQLUtils.writePasswordFile(conf)); passwordFile = new File(MySQLUtils.writePasswordFile(conf));

2
src/java/org/apache/sqoop/mapreduce/db/DBConfiguration.java
View File

@ -299,7 +299,7 @@ public Connection getConnection()
} }
// retrieve the password from the credentials object // retrieve the password from the credentials object
private static String getPassword(JobConf configuration) { public static String getPassword(JobConf configuration) {
LOG.debug("Fetching password from job credentials store"); LOG.debug("Fetching password from job credentials store");
byte[] secret = configuration.getCredentials().getSecretKey( byte[] secret = configuration.getCredentials().getSecretKey(
PASSWORD_SECRET_KEY); PASSWORD_SECRET_KEY);