You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2020/10/13 14:06:04 UTC
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #4399: PR multi tags in host offering [#4398]
DaanHoogland commented on a change in pull request #4399:
URL: https://github.com/apache/cloudstack/pull/4399#discussion_r503977398
##########
File path: engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
##########
@@ -1147,27 +1155,68 @@ public HostVO findByIp(final String ipAddress) {
}
@Override
- public List<Long> listClustersByHostTag(String hostTagOnOffering) {
+ public List<Long> listClustersByHostTag(String computeOfferingTags) {
TransactionLegacy txn = TransactionLegacy.currentTxn();
+ String sql = this.LIST_CLUSTERID_FOR_HOST_TAG;
PreparedStatement pstmt = null;
- List<Long> result = new ArrayList<Long>();
- StringBuilder sql = new StringBuilder(LIST_CLUSTERID_FOR_HOST_TAG);
- // during listing the clusters that cross the threshold
- // we need to check with disabled thresholds of each cluster if not defined at cluster consider the global value
+ List<Long> result = new ArrayList();
+ List<String> tags = Arrays.asList(computeOfferingTags.split(this.SEPARATOR));
+ String subselect = getHostIdsByComputeTags(tags);
+ sql = String.format(sql, subselect);
+
try {
- pstmt = txn.prepareAutoCloseStatement(sql.toString());
- pstmt.setString(1, hostTagOnOffering);
+ pstmt = txn.prepareStatement(sql);
+
+ for(int i = 0; i < tags.size(); i++){
+ pstmt.setString(i+1, tags.get(i));
+ }
+ //pstmt = txn.prepareAutoCloseStatement();
ResultSet rs = pstmt.executeQuery();
- while (rs.next()) {
- result.add(rs.getLong(1));
+ while (rs.next()) {
+ result.add(rs.getLong(1));
+ }
Review comment:
trailing white spce on these lines
```suggestion
while (rs.next()) {
result.add(rs.getLong(1));
}
```
##########
File path: engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
##########
@@ -1147,27 +1155,68 @@ public HostVO findByIp(final String ipAddress) {
}
@Override
- public List<Long> listClustersByHostTag(String hostTagOnOffering) {
+ public List<Long> listClustersByHostTag(String computeOfferingTags) {
TransactionLegacy txn = TransactionLegacy.currentTxn();
+ String sql = this.LIST_CLUSTERID_FOR_HOST_TAG;
PreparedStatement pstmt = null;
- List<Long> result = new ArrayList<Long>();
- StringBuilder sql = new StringBuilder(LIST_CLUSTERID_FOR_HOST_TAG);
- // during listing the clusters that cross the threshold
- // we need to check with disabled thresholds of each cluster if not defined at cluster consider the global value
+ List<Long> result = new ArrayList();
+ List<String> tags = Arrays.asList(computeOfferingTags.split(this.SEPARATOR));
+ String subselect = getHostIdsByComputeTags(tags);
+ sql = String.format(sql, subselect);
+
try {
- pstmt = txn.prepareAutoCloseStatement(sql.toString());
- pstmt.setString(1, hostTagOnOffering);
+ pstmt = txn.prepareStatement(sql);
+
+ for(int i = 0; i < tags.size(); i++){
+ pstmt.setString(i+1, tags.get(i));
+ }
+ //pstmt = txn.prepareAutoCloseStatement();
ResultSet rs = pstmt.executeQuery();
- while (rs.next()) {
- result.add(rs.getLong(1));
+ while (rs.next()) {
+ result.add(rs.getLong(1));
+ }
+ pstmt.close();
+ if(result.isEmpty()){
+ throw new CloudRuntimeException("No suitable host found for follow compute offering tags: " + computeOfferingTags);
}
return result;
} catch (SQLException e) {
throw new CloudRuntimeException("DB Exception on: " + sql, e);
- } catch (Throwable e) {
- throw new CloudRuntimeException("Caught: " + sql, e);
}
}
+
+ private List<Long> findHostByComputeOfferings(String computeOfferingTags){
+ TransactionLegacy txn = TransactionLegacy.currentTxn();
+ PreparedStatement pstmt = null;
+ List<Long> result = new ArrayList();
+ List<String> tags = Arrays.asList(computeOfferingTags.split(this.SEPARATOR));
+ String select = getHostIdsByComputeTags(tags);
+ try {
+ pstmt = txn.prepareStatement(select);
+
+ for(int i = 0; i < tags.size(); i++){
+ pstmt.setString(i+1, tags.get(i));
+ }
+
+ ResultSet rs = pstmt.executeQuery();
+ while (rs.next()) {
+ result.add(rs.getLong(1));
Review comment:
```suggestion
while (rs.next()) {
result.add(rs.getLong(1));
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org