Merge pull request grpc#5188 from jtattermusch/resolve_0_13_merge

Upmerge changes from release-0_13
lenmoyouziJiangjun · Feb 10, 2016 · 6d74725 · 6d74725
2 parents 82e7eff + d883683
commit 6d74725
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/core/iomgr/pollset_windows.c b/src/core/iomgr/pollset_windows.c
@@ -212,10 +212,8 @@ void grpc_pollset_kick(grpc_pollset *p, grpc_pollset_worker *specific_worker) {
         grpc_iocp_kick();
       }
     } else {
-      if (p->is_iocp_worker) {
-        if (g_active_poller == specific_worker) {
-          grpc_iocp_kick();
-        }
+      if (p->is_iocp_worker && g_active_poller == specific_worker) {
+        grpc_iocp_kick();
       } else {
         specific_worker->kicked = 1;
         gpr_cv_signal(&specific_worker->cv);

diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
@@ -111,10 +111,11 @@ def __init__(self, platform, arch, docker_suffix, node_version):
     self.arch = arch
     self.node_version = node_version
     self.labels = ['distribtest', 'node', platform, arch,
-                   docker_suffix, 'node-%s' % node_version]
+                   'node-%s' % node_version]
     if docker_suffix is not None:
       self.name += '_%s' % docker_suffix
       self.docker_suffix = docker_suffix
+      self.labels.append(docker_suffix)
 
   def pre_build_jobspecs(self):
     return []